Define DevTools content API

content/browser/debugger/devtools_manager_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/basictypes.h"
 #include "base/time.h"
-#include "content/browser/debugger/devtools_client_host.h"
-#include "content/browser/debugger/devtools_manager.h"
+#include "content/browser/debugger/devtools_manager_impl.h"
 #include "content/browser/debugger/render_view_devtools_agent_host.h"
 #include "content/browser/mock_content_browser_client.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
 #include "content/browser/tab_contents/tab_contents_delegate.h"
 #include "content/browser/tab_contents/test_tab_contents.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/content_browser_client.h"
+#include "content/public/browser/devtools/devtools_agent_host_registry.h"
+#include "content/public/browser/devtools/devtools_client_host.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::TimeDelta;
+using content::DevToolsAgentHost;
+using content::DevToolsAgentHostRegistry;
+using content::DevToolsClientHost;
+using content::DevToolsManager;
+using content::DevToolsManagerImpl;
 
 namespace {
 
 class TestDevToolsClientHost : public DevToolsClientHost {
  public:
   TestDevToolsClientHost()
       : last_sent_message(NULL),
         closed_(false) {
   }
 
@@ skipping 56 matching lines @@
  private:
   bool renderer_unresponsive_received_;
 };
 
 class DevToolsManagerTestBrowserClient
     : public content::MockContentBrowserClient {
  public:
   DevToolsManagerTestBrowserClient() {
   }
 
-  virtual DevToolsManager* GetDevToolsManager() OVERRIDE {
-    return &dev_tools_manager_;
-  }
-
   virtual bool ShouldSwapProcessesForNavigation(
       const GURL& current_url,
       const GURL& new_url) OVERRIDE {
     return true;
   }
 
  private:
-  DevToolsManager dev_tools_manager_;
-
   DISALLOW_COPY_AND_ASSIGN(DevToolsManagerTestBrowserClient);
 };
 
 }  // namespace
 
 class DevToolsManagerTest : public RenderViewHostTestHarness {
  public:
   DevToolsManagerTest() : RenderViewHostTestHarness() {
   }
 
@@ skipping 10 matching lines @@
     RenderViewHostTestHarness::TearDown();
     content::GetContentClient()->set_browser(original_browser_client_);
   }
 
  private:
   content::ContentBrowserClient* original_browser_client_;
   DevToolsManagerTestBrowserClient browser_client_;
 };
 
 TEST_F(DevToolsManagerTest, OpenAndManuallyCloseDevToolsClientHost) {
-  DevToolsManager manager;
+  DevToolsManagerImpl manager;
 
-  DevToolsClientHost* host = manager.GetDevToolsClientHostFor(rvh());
+  DevToolsAgentHost* agent =
+      DevToolsAgentHostRegistry::GetDevToolsAgentHost(rvh());
+  DevToolsClientHost* host = manager.GetDevToolsClientHostFor(agent);
   EXPECT_TRUE(NULL == host);
 
   TestDevToolsClientHost client_host;
-  manager.RegisterDevToolsClientHostFor(rvh(), &client_host);
+  manager.RegisterDevToolsClientHostFor(agent, &client_host);
   // Test that just registered devtools host is returned.
-  host = manager.GetDevToolsClientHostFor(rvh());
+  host = manager.GetDevToolsClientHostFor(agent);
   EXPECT_TRUE(&client_host == host);
   EXPECT_EQ(0, TestDevToolsClientHost::close_counter);
 
   // Test that the same devtools host is returned.
-  host = manager.GetDevToolsClientHostFor(rvh());
+  host = manager.GetDevToolsClientHostFor(agent);
   EXPECT_TRUE(&client_host == host);
   EXPECT_EQ(0, TestDevToolsClientHost::close_counter);
 
   client_host.Close();
   EXPECT_EQ(1, TestDevToolsClientHost::close_counter);
-  host = manager.GetDevToolsClientHostFor(rvh());
+  host = manager.GetDevToolsClientHostFor(agent);
   EXPECT_TRUE(NULL == host);
 }
 
 TEST_F(DevToolsManagerTest, ForwardMessageToClient) {
-  DevToolsManager manager;
+  DevToolsManagerImpl manager;
 
   TestDevToolsClientHost client_host;
-  manager.RegisterDevToolsClientHostFor(rvh(), &client_host);
+  DevToolsAgentHost* agent_host =
+      DevToolsAgentHostRegistry::GetDevToolsAgentHost(rvh());
+  manager.RegisterDevToolsClientHostFor(agent_host, &client_host);
   EXPECT_EQ(0, TestDevToolsClientHost::close_counter);
 
   IPC::Message m;
-  DevToolsAgentHost* agent_host = RenderViewDevToolsAgentHost::FindFor(rvh());
+  agent_host = DevToolsAgentHostRegistry::GetDevToolsAgentHost(rvh());
   manager.ForwardToDevToolsClient(agent_host, m);
   EXPECT_TRUE(&m == client_host.last_sent_message);
 
   client_host.Close();
   EXPECT_EQ(1, TestDevToolsClientHost::close_counter);
 }
 
 TEST_F(DevToolsManagerTest, NoUnresponsiveDialogInInspectedTab) {
   TestRenderViewHost* inspected_rvh = rvh();
   inspected_rvh->set_render_view_created(true);
   EXPECT_FALSE(contents()->delegate());
   TestTabContentsDelegate delegate;
   contents()->set_delegate(&delegate);
 
   TestDevToolsClientHost client_host;
-  content::GetContentClient()->browser()->GetDevToolsManager()->
-      RegisterDevToolsClientHostFor(inspected_rvh, &client_host);
+  DevToolsAgentHost* agent_host =
+      DevToolsAgentHostRegistry::GetDevToolsAgentHost(inspected_rvh);
+  DevToolsManager::GetInstance()->
+      RegisterDevToolsClientHostFor(agent_host, &client_host);
 
   // Start with a short timeout.
   inspected_rvh->StartHangMonitorTimeout(TimeDelta::FromMilliseconds(10));
   // Wait long enough for first timeout and see if it fired.
   MessageLoop::current()->PostDelayedTask(FROM_HERE,
                                           new MessageLoop::QuitTask(), 10);
   MessageLoop::current()->Run();
   EXPECT_FALSE(delegate.renderer_unresponsive_received());
 
   // Now close devtools and check that the notification is delivered.
@@ skipping 16 matching lines @@
   controller().LoadURL(
       url, GURL(), content::PAGE_TRANSITION_TYPED, std::string());
   ViewHostMsg_FrameNavigate_Params params1;
   InitNavigateParams(&params1, 1, url, content::PAGE_TRANSITION_TYPED);
   TestRenderViewHost* orig_rvh = rvh();
   contents()->TestDidNavigate(orig_rvh, params1);
   EXPECT_FALSE(contents()->cross_navigation_pending());
 
   TestDevToolsClientHost client_host;
   DevToolsManager* devtools_manager = DevToolsManager::GetInstance();
-  devtools_manager->RegisterDevToolsClientHostFor(rvh(), &client_host);
+  devtools_manager->RegisterDevToolsClientHostFor(
+      DevToolsAgentHostRegistry::GetDevToolsAgentHost(rvh()),
+      &client_host);
 
   // Navigate to new site which should get a new RenderViewHost.
   const GURL url2("http://www.yahoo.com");
   controller().LoadURL(
       url2, GURL(), content::PAGE_TRANSITION_TYPED, std::string());
   EXPECT_TRUE(contents()->cross_navigation_pending());
-  EXPECT_EQ(&client_host,
-            devtools_manager->GetDevToolsClientHostFor(pending_rvh()));
+  EXPECT_EQ(&client_host, devtools_manager->GetDevToolsClientHostFor(
+      DevToolsAgentHostRegistry::GetDevToolsAgentHost(pending_rvh())));
 
   // Interrupt pending navigation and navigate back to the original site.
   controller().LoadURL(
       url, GURL(), content::PAGE_TRANSITION_TYPED, std::string());
   contents()->TestDidNavigate(orig_rvh, params1);
   EXPECT_FALSE(contents()->cross_navigation_pending());
-  EXPECT_EQ(&client_host, devtools_manager->GetDevToolsClientHostFor(rvh()));
+  EXPECT_EQ(&client_host, devtools_manager->GetDevToolsClientHostFor(
+      DevToolsAgentHostRegistry::GetDevToolsAgentHost(rvh())));
   client_host.Close();
 }