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

chrome/browser/android/dev_tools_server.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 "chrome/browser/android/dev_tools_server.h"
 
 #include <pwd.h>
 #include <cstring>
 
 #include "base/android/jni_string.h"
@@ skipping 141 matching lines @@
       return NULL;
     WebContents* web_contents = model->GetWebContentsAt(index);
     if (!web_contents) {
       // The tab has been pushed out of memory, pull it back.
       TabAndroid* tab = model->GetTabAt(index);
       tab->LoadIfNeeded();
       web_contents = model->GetWebContentsAt(index);
       if (!web_contents)
         return NULL;
     }
-    RenderViewHost* rvh = web_contents->GetRenderViewHost();
-    return rvh ? DevToolsAgentHost::GetOrCreateFor(rvh) : NULL;
+    return DevToolsAgentHost::GetOrCreateFor(web_contents);
   }
 
   virtual bool Activate() const OVERRIDE {
     TabModel* model;
     int index;
     if (!FindTab(&model, &index))
       return false;
     model->SetActiveIndex(index);
     return true;
   }
@@ skipping 34 matching lines @@
     return false;
   }
 
   const int tab_id_;
 };
 
 class NonTabTarget : public TargetBase {
  public:
   explicit NonTabTarget(WebContents* web_contents)
       : TargetBase(web_contents),
-        agent_host_(DevToolsAgentHost::GetOrCreateFor(
-            web_contents->GetRenderViewHost())) {
+        agent_host_(DevToolsAgentHost::GetOrCreateFor(web_contents)) {
   }
 
   // content::DevToolsTarget implementation:
   virtual std::string GetId() const OVERRIDE {
     return agent_host_->GetId();
   }
 
   virtual std::string GetType() const OVERRIDE {
     if (TabModelList::begin() == TabModelList::end()) {
       // If there are no tab models we must be running in ChromeShell.
       // Return the 'page' target type for backwards compatibility.
       return kTargetTypePage;
     }
     return kTargetTypeOther;
   }
 
   virtual bool IsAttached() const OVERRIDE {
     return agent_host_->IsAttached();
   }
 
   virtual scoped_refptr<DevToolsAgentHost> GetAgentHost() const OVERRIDE {
     return agent_host_;
   }
 
   virtual bool Activate() const OVERRIDE {
-    RenderViewHost* rvh = agent_host_->GetRenderViewHost();
-    if (!rvh)
-      return false;
-    WebContents* web_contents = WebContents::FromRenderViewHost(rvh);
+    WebContents* web_contents = agent_host_->GetWebContents();
     if (!web_contents)
       return false;
     web_contents->GetDelegate()->ActivateContents(web_contents);
     return true;
   }
 
   virtual bool Close() const OVERRIDE {
-    RenderViewHost* rvh = agent_host_->GetRenderViewHost();
-    if (!rvh)
+    WebContents* web_contents = agent_host_->GetWebContents();
+    if (!web_contents)
       return false;
-    rvh->ClosePage();
+    web_contents->GetRenderViewHost()->ClosePage();
     return true;
   }
 
  private:
   scoped_refptr<DevToolsAgentHost> agent_host_;
 };
 
 // Delegate implementation for the devtools http handler on android. A new
 // instance of this gets created each time devtools is enabled.
 class DevToolsServerDelegate : public content::DevToolsHttpHandlerDelegate {
@@ skipping 69 matching lines @@
                                                             web_contents));
         } else {
           targets.push_back(TabTarget::CreateForUnloadedTab(tab->GetAndroidId(),
                                                             tab->GetTitle(),
                                                             tab->GetURL()));
         }
       }
     }
 
     // Add targets for WebContents not associated with any tabs.
-    std::vector<RenderViewHost*> rvh_list =
-        DevToolsAgentHost::GetValidRenderViewHosts();
-    for (std::vector<RenderViewHost*>::iterator it = rvh_list.begin();
-         it != rvh_list.end(); ++it) {
-      WebContents* web_contents = WebContents::FromRenderViewHost(*it);
-      if (!web_contents)
+    std::vector<WebContents*> wc_list =
+        DevToolsAgentHost::GetInspectableWebContents();
+    for (std::vector<WebContents*>::iterator it = wc_list.begin();
+         it != wc_list.end();
+         ++it) {
+      if (tab_web_contents.find(*it) != tab_web_contents.end())
         continue;
-      if (tab_web_contents.find(web_contents) != tab_web_contents.end())
-        continue;
-      targets.push_back(new NonTabTarget(web_contents));
+      targets.push_back(new NonTabTarget(*it));
     }
 
     callback.Run(targets);
   }
 
   virtual scoped_ptr<net::StreamListenSocket> CreateSocketForTethering(
       net::StreamListenSocket::Delegate* delegate,
       std::string* name) OVERRIDE {
     *name = base::StringPrintf(
         kTetheringSocketName, getpid(), ++last_tethering_socket_);
@@ skipping 103 matching lines @@
                                       jobject obj,
                                       jlong server,
                                       jboolean enabled) {
   DevToolsServer* devtools_server = reinterpret_cast<DevToolsServer*>(server);
   if (enabled) {
     devtools_server->Start();
   } else {
     devtools_server->Stop();
   }
 }