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

chrome/browser/apps/app_browsertest.cc

 // Copyright 2013 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 "apps/app_window.h"
 #include "apps/app_window_registry.h"
 #include "apps/launcher.h"
 #include "apps/ui/native_app_window.h"
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 805 matching lines @@
 };
 
 void PlatformAppDevToolsBrowserTest::RunTestWithDevTools(
     const char* name, int test_flags) {
   using content::DevToolsAgentHost;
   const Extension* extension = LoadAndLaunchPlatformApp(name, "Launched");
   ASSERT_TRUE(extension);
   AppWindow* window = GetFirstAppWindow();
   ASSERT_TRUE(window);
   ASSERT_EQ(window->window_key().empty(), (test_flags & HAS_ID) == 0);
-  content::RenderViewHost* rvh = window->web_contents()->GetRenderViewHost();
-  ASSERT_TRUE(rvh);
+  content::WebContents* web_contents = window->web_contents();
+  ASSERT_TRUE(web_contents);
 
   // Ensure no DevTools open for the AppWindow, then open one.
-  ASSERT_FALSE(DevToolsAgentHost::HasFor(rvh));
-  DevToolsWindow::OpenDevToolsWindow(rvh);
-  ASSERT_TRUE(DevToolsAgentHost::HasFor(rvh));
+  ASSERT_FALSE(DevToolsAgentHost::HasFor(web_contents));
+  DevToolsWindow::OpenDevToolsWindow(web_contents);
+  ASSERT_TRUE(DevToolsAgentHost::HasFor(web_contents));
 
   if (test_flags & RELAUNCH) {
     // Close the AppWindow, and ensure it is gone.
     CloseAppWindow(window);
     ASSERT_FALSE(GetFirstAppWindow());
 
     // Relaunch the app and get a new AppWindow.
     content::WindowedNotificationObserver app_loaded_observer(
         content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
         content::NotificationService::AllSources());
     OpenApplication(AppLaunchParams(
         browser()->profile(), extension, LAUNCH_CONTAINER_NONE, NEW_WINDOW));
     app_loaded_observer.Wait();
     window = GetFirstAppWindow();
     ASSERT_TRUE(window);
 
     // DevTools should have reopened with the relaunch.
-    rvh = window->web_contents()->GetRenderViewHost();
-    ASSERT_TRUE(rvh);
-    ASSERT_TRUE(DevToolsAgentHost::HasFor(rvh));
+    web_contents = window->web_contents();
+    ASSERT_TRUE(web_contents);
+    ASSERT_TRUE(DevToolsAgentHost::HasFor(web_contents));
   }
 }
 
 }  // namespace
 
 // http://crbug.com/246634
 #if defined(OS_CHROMEOS)
 #define MAYBE_ReOpenedWithID DISABLED_ReOpenedWithID
 #else
 #define MAYBE_ReOpenedWithID ReOpenedWithID
@@ skipping 421 matching lines @@
         LoadAndLaunchPlatformApp("reinstall_data_cleanup", "Launched");
     ASSERT_TRUE(extension);
     ASSERT_EQ(extension_id, extension->id());
 
     ExtensionApiTest::ResultCatcher result_catcher;
     EXPECT_TRUE(result_catcher.GetNextResult());
   }
 }
 
 }  // namespace extensions