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

chrome/browser/devtools/devtools_target_impl.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 "chrome/browser/devtools/devtools_target_impl.h"
 
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
@@ skipping 43 matching lines @@
   virtual int GetTabId() const OVERRIDE;
   virtual std::string GetExtensionId() const OVERRIDE;
   virtual void Inspect(Profile* profile) const OVERRIDE;
 
  private:
   int tab_id_;
   std::string extension_id_;
 };
 
 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);
   if (!web_contents)
     return;  // Orphan RVH will show up with no title/url/icon in clients.
 
   content::RenderFrameHost* rfh = rvh->GetMainFrame();
   if (rfh->IsCrossProcessSubframe()) {
     set_url(rfh->GetLastCommittedURL());
     set_type(kTargetTypeIFrame);
     // 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;
   }
 
   set_title(base::UTF16ToUTF8(web_contents->GetTitle()));
   set_url(web_contents->GetURL());
   content::NavigationController& controller = web_contents->GetController();
   content::NavigationEntry* entry = controller.GetActiveEntry();
   if (entry != NULL && entry->GetURL().is_valid())
     set_favicon_url(entry->GetFavicon().url);
   set_last_activity_time(web_contents->GetLastActiveTime());
 
   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;
   }
 
   if (is_tab) {
     set_type(kTargetTypePage);
     tab_id_ = extensions::ExtensionTabUtil::GetTabId(web_contents);
     return;
   }
 
   const extensions::Extension* extension = extensions::ExtensionRegistry::Get(
@@ skipping 54 matching lines @@
 }
 
 std::string RenderViewHostTarget::GetExtensionId() const {
   return extension_id_;
 }
 
 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 ----------------------------------------------------------------
 
 class WorkerTarget : public DevToolsTargetImpl {
  public:
   explicit WorkerTarget(const WorkerService::WorkerInfo& worker_info);
 
   // content::DevToolsTarget overrides:
   virtual bool Close() const OVERRIDE;
@@ skipping 170 matching lines @@
 
 // static
 void DevToolsTargetImpl::EnumerateAllTargets(Callback callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   content::BrowserThread::PostTask(
       content::BrowserThread::IO,
       FROM_HERE,
       base::Bind(&DevToolsTargetImpl::EnumerateWorkerTargets,
                  base::Bind(&CollectAllTargets, callback)));
 }