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

chrome/browser/devtools/devtools_target_impl.cc

Index: chrome/browser/devtools/devtools_target_impl.cc
diff --git a/chrome/browser/devtools/devtools_target_impl.cc b/chrome/browser/devtools/devtools_target_impl.cc
index 62f6354aa5ca704c86d66f4eb6eb183372155c87..cc03aa40844f50fc1a15c5261b0d9a8a765d573b 100644
--- a/chrome/browser/devtools/devtools_target_impl.cc
+++ b/chrome/browser/devtools/devtools_target_impl.cc
@@ -61,7 +61,8 @@ class RenderViewHostTarget : public DevToolsTargetImpl {
 };
 
 RenderViewHostTarget::RenderViewHostTarget(RenderViewHost* rvh, bool is_tab)
-    : DevToolsTargetImpl(DevToolsAgentHost::GetOrCreateFor(rvh)),
+    : DevToolsTargetImpl(DevToolsAgentHost::GetOrCreateFor(
+          WebContents::FromRenderViewHost(rvh))),
       tab_id_(-1) {
   set_type(kTargetTypeOther);
   WebContents* web_contents = WebContents::FromRenderViewHost(rvh);
@@ -75,7 +76,8 @@ RenderViewHostTarget::RenderViewHostTarget(RenderViewHost* rvh, bool is_tab)
     // TODO(kaznacheev) Try setting the title when the frame navigation
     // refactoring is done.
     RenderViewHost* parent_rvh = rfh->GetParent()->GetRenderViewHost();
-    set_parent_id(DevToolsAgentHost::GetOrCreateFor(parent_rvh)->GetId());
+    set_parent_id(DevToolsAgentHost::GetOrCreateFor(
+        WebContents::FromRenderViewHost(parent_rvh))->GetId());
     return;
   }
 
@@ -89,11 +91,9 @@ RenderViewHostTarget::RenderViewHostTarget(RenderViewHost* rvh, bool is_tab)
 
   GuestViewBase* guest = GuestViewBase::FromWebContents(web_contents);
   WebContents* guest_contents = guest ? guest->embedder_web_contents() : NULL;
-  RenderViewHost* guest_parent_rvh =
-      guest_contents ? guest_contents->GetRenderViewHost() : NULL;
-  if (guest_parent_rvh) {
+  if (guest_contents) {
     set_type(kTargetTypeWebView);
-    set_parent_id(DevToolsAgentHost::GetOrCreateFor(guest_parent_rvh)->GetId());
+    set_parent_id(DevToolsAgentHost::GetOrCreateFor(guest_contents)->GetId());
     return;
   }
 
@@ -168,7 +168,10 @@ void RenderViewHostTarget::Inspect(Profile* profile) const {
   RenderViewHost* rvh = GetRenderViewHost();
   if (!rvh)
     return;
-  DevToolsWindow::OpenDevToolsWindow(rvh);
+  WebContents* web_contents = WebContents::FromRenderViewHost(rvh);
+  if (!web_contents)
+    return;
+  DevToolsWindow::OpenDevToolsWindow(web_contents);
 }
 
 // WorkerTarget ----------------------------------------------------------------