DevTools: migrate DevTools APIs to use WebContents instead of RenderViewHost.

content/browser/devtools/devtools_manager_unittest.cc

 // Copyright (c) 2012 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/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "content/browser/devtools/devtools_manager_impl.h"
 #include "content/browser/devtools/render_view_devtools_agent_host.h"
 #include "content/common/view_messages.h"
@@ skipping 83 matching lines @@
   virtual void SetUp() OVERRIDE {
     RenderViewHostImplTestHarness::SetUp();
     TestDevToolsClientHost::ResetCounters();
   }
 };
 
 TEST_F(DevToolsManagerTest, OpenAndManuallyCloseDevToolsClientHost) {
   DevToolsManager* manager = DevToolsManager::GetInstance();
 
   scoped_refptr<DevToolsAgentHost> agent(
-      DevToolsAgentHost::GetOrCreateFor(rvh()));
+      DevToolsAgentHost::GetOrCreateFor(web_contents()));
   EXPECT_FALSE(agent->IsAttached());
 
   TestDevToolsClientHost client_host;
   manager->RegisterDevToolsClientHostFor(agent.get(), &client_host);
   // 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);
   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(rvh()));
+      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(rvh());
+  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);
   EXPECT_FALSE(contents()->GetDelegate());
   TestWebContentsDelegate delegate;
   contents()->SetDelegate(&delegate);
 
   TestDevToolsClientHost client_host;
-  scoped_refptr<DevToolsAgentHost> agent_host(
-      DevToolsAgentHost::GetOrCreateFor(inspected_rvh));
+  scoped_refptr<DevToolsAgentHost> agent_host(DevToolsAgentHost::GetOrCreateFor(
+      WebContents::FromRenderViewHost(inspected_rvh)));
   DevToolsManager::GetInstance()->RegisterDevToolsClientHostFor(
       agent_host.get(), &client_host);
 
   // Start with a short timeout.
   inspected_rvh->StartHangMonitorTimeout(TimeDelta::FromMilliseconds(10));
   // Wait long enough for first timeout and see if it fired.
   base::MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::MessageLoop::QuitClosure(),
       TimeDelta::FromMilliseconds(10));
@@ skipping 19 matching lines @@
   // 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());
   contents()->TestDidNavigate(rvh(), 1, url, PAGE_TRANSITION_TYPED);
   EXPECT_FALSE(contents()->cross_navigation_pending());
 
   TestDevToolsClientHost client_host;
   DevToolsManager* devtools_manager = DevToolsManager::GetInstance();
   devtools_manager->RegisterDevToolsClientHostFor(
-      DevToolsAgentHost::GetOrCreateFor(rvh()).get(), &client_host);
+      DevToolsAgentHost::GetOrCreateFor(web_contents()).get(), &client_host);
 
   // 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());
   EXPECT_TRUE(contents()->cross_navigation_pending());
   EXPECT_EQ(devtools_manager->GetDevToolsAgentHostFor(&client_host),
-      DevToolsAgentHost::GetOrCreateFor(pending_rvh()));
+            DevToolsAgentHost::GetOrCreateFor(web_contents()));
 
   // Interrupt pending navigation and navigate back to the original site.
   controller().LoadURL(
       url, Referrer(), PAGE_TRANSITION_TYPED, std::string());
   contents()->TestDidNavigate(rvh(), 1, url, PAGE_TRANSITION_TYPED);
   EXPECT_FALSE(contents()->cross_navigation_pending());
   EXPECT_EQ(devtools_manager->GetDevToolsAgentHostFor(&client_host),
-      DevToolsAgentHost::GetOrCreateFor(rvh()));
+            DevToolsAgentHost::GetOrCreateFor(web_contents()));
   client_host.Close(DevToolsManager::GetInstance());
 }
 
 class TestExternalAgentDelegate: public DevToolsExternalAgentProxyDelegate {
   std::map<std::string,int> event_counter_;
 
   void recordEvent(const std::string& name) {
     if (event_counter_.find(name) == event_counter_.end())
       event_counter_[name] = 0;
     event_counter_[name] = event_counter_[name] + 1;
@@ skipping 38 matching lines @@
   manager->RegisterDevToolsClientHostFor(agent_host.get(), &client_host);
 
   manager->DispatchOnInspectorBackend(&client_host, "message1");
   manager->DispatchOnInspectorBackend(&client_host, "message2");
   manager->DispatchOnInspectorBackend(&client_host, "message2");
 
   client_host.Close(manager);
 }
 
 }  // namespace content