#include "base/basictypes.h"
#include "base/memory/scoped_ptr.h"
#include "base/time/time.h"
-#include "content/browser/devtools/devtools_manager_impl.h"
+#include "content/browser/devtools/devtools_manager.h"
#include "content/browser/devtools/render_view_devtools_agent_host.h"
#include "content/common/view_messages.h"
#include "content/public/browser/content_browser_client.h"
#include "content/public/browser/devtools_agent_host.h"
-#include "content/public/browser/devtools_client_host.h"
#include "content/public/browser/devtools_external_agent_proxy.h"
#include "content/public/browser/devtools_external_agent_proxy_delegate.h"
#include "content/public/browser/web_contents_delegate.h"
namespace content {
namespace {
-class TestDevToolsClientHost : public DevToolsClientHost {
+class TestDevToolsClientHost : public DevToolsAgentHostClient {
public:
TestDevToolsClientHost()
: last_sent_message(NULL),
EXPECT_TRUE(closed_);
}
- virtual void Close(DevToolsManager* manager) {
+ void Close() {
EXPECT_FALSE(closed_);
close_counter++;
- manager->ClientHostClosing(this);
+ agent_host_->DetachClient();
closed_ = true;
}
- virtual void InspectedContentsClosing() OVERRIDE {
+
+ virtual void AgentHostClosed(
+ DevToolsAgentHost* agent_host, bool replaced) OVERRIDE {
FAIL();
}
- virtual void DispatchOnInspectorFrontend(
- const std::string& message) OVERRIDE {
+ virtual void DispatchProtocolMessage(
+ DevToolsAgentHost* agent_host, const std::string& message) OVERRIDE {
last_sent_message = &message;
}
- virtual void ReplacedWithAnotherClient() OVERRIDE {
+ void InspectAgentHost(DevToolsAgentHost* agent_host) {
+ agent_host_ = agent_host;
+ agent_host_->AttachClient(this);
}
+ DevToolsAgentHost* agent_host() { return agent_host_.get(); }
+
static void ResetCounters() {
close_counter = 0;
}
private:
bool closed_;
+ scoped_refptr<DevToolsAgentHost> agent_host_;
DISALLOW_COPY_AND_ASSIGN(TestDevToolsClientHost);
};
};
TEST_F(DevToolsManagerTest, OpenAndManuallyCloseDevToolsClientHost) {
- DevToolsManager* manager = DevToolsManager::GetInstance();
-
scoped_refptr<DevToolsAgentHost> agent(
DevToolsAgentHost::GetOrCreateFor(web_contents()));
EXPECT_FALSE(agent->IsAttached());
TestDevToolsClientHost client_host;
- manager->RegisterDevToolsClientHostFor(agent.get(), &client_host);
+ client_host.InspectAgentHost(agent.get());
// Test that the connection is established.
EXPECT_TRUE(agent->IsAttached());
- EXPECT_EQ(agent, manager->GetDevToolsAgentHostFor(&client_host));
EXPECT_EQ(0, TestDevToolsClientHost::close_counter);
- client_host.Close(manager);
+ client_host.Close();
EXPECT_EQ(1, TestDevToolsClientHost::close_counter);
EXPECT_FALSE(agent->IsAttached());
}
-TEST_F(DevToolsManagerTest, ForwardMessageToClient) {
- DevToolsManagerImpl* manager = DevToolsManagerImpl::GetInstance();
-
- TestDevToolsClientHost client_host;
- scoped_refptr<DevToolsAgentHost> agent_host(
- DevToolsAgentHost::GetOrCreateFor(web_contents()));
- manager->RegisterDevToolsClientHostFor(agent_host.get(), &client_host);
- EXPECT_EQ(0, TestDevToolsClientHost::close_counter);
-
- std::string m = "test message";
- agent_host = DevToolsAgentHost::GetOrCreateFor(web_contents());
- manager->DispatchOnInspectorFrontend(agent_host.get(), m);
- EXPECT_TRUE(&m == client_host.last_sent_message);
-
- client_host.Close(manager);
- EXPECT_EQ(1, TestDevToolsClientHost::close_counter);
-}
-
TEST_F(DevToolsManagerTest, NoUnresponsiveDialogInInspectedContents) {
TestRenderViewHost* inspected_rvh = test_rvh();
inspected_rvh->set_render_view_created(true);
TestDevToolsClientHost client_host;
scoped_refptr<DevToolsAgentHost> agent_host(DevToolsAgentHost::GetOrCreateFor(
WebContents::FromRenderViewHost(inspected_rvh)));
- DevToolsManager::GetInstance()->RegisterDevToolsClientHostFor(
- agent_host.get(), &client_host);
+ client_host.InspectAgentHost(agent_host.get());
// Start with a short timeout.
inspected_rvh->StartHangMonitorTimeout(TimeDelta::FromMilliseconds(10));
EXPECT_FALSE(delegate.renderer_unresponsive_received());
// Now close devtools and check that the notification is delivered.
- client_host.Close(DevToolsManager::GetInstance());
+ client_host.Close();
// Start with a short timeout.
inspected_rvh->StartHangMonitorTimeout(TimeDelta::FromMilliseconds(10));
// Wait long enough for first timeout and see if it fired.
// Navigate to URL. First URL should use first RenderViewHost.
const GURL url("http://www.google.com");
controller().LoadURL(
- url, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ url, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
contents()->TestDidNavigate(
- contents()->GetMainFrame(), 1, url, PAGE_TRANSITION_TYPED);
+ contents()->GetMainFrame(), 1, url, ui::PAGE_TRANSITION_TYPED);
EXPECT_FALSE(contents()->cross_navigation_pending());
TestDevToolsClientHost client_host;
- DevToolsManager* devtools_manager = DevToolsManager::GetInstance();
- devtools_manager->RegisterDevToolsClientHostFor(
- DevToolsAgentHost::GetOrCreateFor(web_contents()).get(), &client_host);
+ client_host.InspectAgentHost(
+ DevToolsAgentHost::GetOrCreateFor(web_contents()).get());
// Navigate to new site which should get a new RenderViewHost.
const GURL url2("http://www.yahoo.com");
controller().LoadURL(
- url2, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ url2, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
EXPECT_TRUE(contents()->cross_navigation_pending());
- EXPECT_EQ(devtools_manager->GetDevToolsAgentHostFor(&client_host),
- DevToolsAgentHost::GetOrCreateFor(web_contents()));
+ EXPECT_EQ(client_host.agent_host(),
+ DevToolsAgentHost::GetOrCreateFor(web_contents()).get());
// Interrupt pending navigation and navigate back to the original site.
controller().LoadURL(
- url, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ url, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
contents()->TestDidNavigate(
- contents()->GetMainFrame(), 1, url, PAGE_TRANSITION_TYPED);
+ contents()->GetMainFrame(), 1, url, ui::PAGE_TRANSITION_TYPED);
EXPECT_FALSE(contents()->cross_navigation_pending());
- EXPECT_EQ(devtools_manager->GetDevToolsAgentHostFor(&client_host),
- DevToolsAgentHost::GetOrCreateFor(web_contents()));
- client_host.Close(DevToolsManager::GetInstance());
+ EXPECT_EQ(client_host.agent_host(),
+ DevToolsAgentHost::GetOrCreateFor(web_contents()).get());
+ client_host.Close();
}
class TestExternalAgentDelegate: public DevToolsExternalAgentProxyDelegate {
DevToolsAgentHost::Create(delegate);
EXPECT_EQ(agent_host, DevToolsAgentHost::GetForId(agent_host->GetId()));
- DevToolsManager* manager = DevToolsManager::GetInstance();
-
TestDevToolsClientHost client_host;
- manager->RegisterDevToolsClientHostFor(agent_host.get(), &client_host);
-
- manager->DispatchOnInspectorBackend(&client_host, "message1");
- manager->DispatchOnInspectorBackend(&client_host, "message2");
- manager->DispatchOnInspectorBackend(&client_host, "message2");
+ client_host.InspectAgentHost(agent_host.get());
+ agent_host->DispatchProtocolMessage("message1");
+ agent_host->DispatchProtocolMessage("message2");
+ agent_host->DispatchProtocolMessage("message2");
- client_host.Close(manager);
+ client_host.Close();
}
} // namespace content