DevTools: Extract target discovery and manipulation from DevToolsHttpHandlerImpl

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"
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/devtools/devtools_adb_bridge.h"
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/android/tab_model/tab_model.h"
 #include "chrome/browser/ui/android/tab_model/tab_model_list.h"
 #include "content/public/browser/android/devtools_auth.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/devtools_agent_host.h"
 #include "content/public/browser/devtools_http_handler.h"
 #include "content/public/browser/devtools_http_handler_delegate.h"
+#include "content/public/browser/devtools_target_descriptor.h"
+#include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/browser/web_contents_delegate.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/url_constants.h"
 #include "grit/devtools_discovery_page_resources.h"
 #include "jni/DevToolsServer_jni.h"
 #include "net/socket/unix_domain_socket_posix.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "webkit/common/user_agent/user_agent_util.h"
 
+using content::DevToolsAgentHost;
+using content::RenderViewHost;
+using content::WebContents;
+
 namespace {
 
 const char kFrontEndURL[] =
     "http://chrome-devtools-frontend.appspot.com/serve_rev/%s/devtools.html";
 const char kDefaultSocketNamePrefix[] = "chrome";
 const char kTetheringSocketName[] = "chrome_devtools_tethering_%d_%d";
 
+RenderViewHost* GetRenderViewHost(const std::string& id) {
+  DevToolsAgentHost* agent_host = DevToolsAgentHost::GetForId(id);
+  return agent_host ? agent_host->GetRenderViewHost() : NULL;
+}
+
+WebContents* GetWebContents(const std::string& id) {
+  RenderViewHost* rvh = GetRenderViewHost(id);
+  return rvh ? WebContents::FromRenderViewHost(rvh) : NULL;
+}
+
 // 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 {
  public:
   DevToolsServerDelegate()
       : last_tethering_socket_(0) {
   }
 
   virtual std::string GetDiscoveryPageHTML() OVERRIDE {
     // TopSites updates itself after a delay. Ask TopSites to update itself
     // when we're about to show the remote debugging landing page.
     content::BrowserThread::PostTask(
         content::BrowserThread::UI,
         FROM_HERE,
         base::Bind(&DevToolsServerDelegate::PopulatePageThumbnails));
     return ResourceBundle::GetSharedInstance().GetRawDataResource(
         IDR_DEVTOOLS_DISCOVERY_PAGE_HTML).as_string();
   }
 
   virtual bool BundlesFrontendResources() OVERRIDE {
     return false;
   }
 
   virtual base::FilePath GetDebugFrontendDir() OVERRIDE {
     return base::FilePath();
   }
 
-  virtual std::string GetPageThumbnailData(const GURL& url) OVERRIDE {
+  virtual bool SupportsPageThumbnails() OVERRIDE {
+    return true;
+  }
+
+  virtual std::string GetPageThumbnailData(const std::string& id) OVERRIDE {
+    WebContents* web_contents = GetWebContents(id);
+    if (!web_contents)
+      return "";
+
+    GURL url = web_contents->GetURL();
     Profile* profile =
         ProfileManager::GetLastUsedProfile()->GetOriginalProfile();
     history::TopSites* top_sites = profile->GetTopSites();
     if (top_sites) {
       scoped_refptr<base::RefCountedMemory> data;
       if (top_sites->GetPageThumbnail(url, false, &data))
         return std::string(reinterpret_cast<const char*>(data->front()),
                            data->size());
     }
     return "";
   }
 
-  virtual content::RenderViewHost* CreateNewTarget() OVERRIDE {
+  virtual Target* CreateNewTarget() OVERRIDE {
     Profile* profile =
         g_browser_process->profile_manager()->GetDefaultProfile();
     TabModel* tab_model = TabModelList::GetTabModelWithProfile(profile);
     if (!tab_model)
       return NULL;
-    content::WebContents* web_contents =
+    WebContents* web_contents =
         tab_model->CreateTabForTesting(GURL(content::kAboutBlankURL));
     if (!web_contents)
       return NULL;
-    return web_contents->GetRenderViewHost();
+    return Target::FromWebContents(web_contents);
   }
 
-  virtual TargetType GetTargetType(content::RenderViewHost*) OVERRIDE {
-    return kTargetTypeTab;
+  virtual bool ActivateTarget(const std::string& id) OVERRIDE {
+    WebContents* web_contents = GetWebContents(id);
+    if (!web_contents)
+      return false;
+    web_contents->GetDelegate()->ActivateContents(web_contents);
+    return true;
   }
 
-  virtual std::string GetViewDescription(content::RenderViewHost*) OVERRIDE {
-    return "";
+  virtual bool CloseTarget(const std::string& id) OVERRIDE {
+    RenderViewHost* rvh = GetRenderViewHost(id);
+    if (!rvh)
+      return false;
+    rvh->ClosePage();
+    return true;
+  }
+
+  virtual scoped_refptr<DevToolsAgentHost> GetAgentHost(
+        const std::string& id) OVERRIDE {
+    return DevToolsAgentHost::GetForId(id);
+  }
+
+  virtual void RequestTargets(TargetCallback callback) OVERRIDE {
+    TargetList targets;
+    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)
+        targets.push_back(Target::FromWebContents(web_contents));
+    }
+    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_);
     return net::UnixDomainSocket::CreateAndListenWithAbstractNamespace(
                *name,
                "",
@@ skipping 99 matching lines @@
                                       jobject obj,
                                       jint server,
                                       jboolean enabled) {
   DevToolsServer* devtools_server = reinterpret_cast<DevToolsServer*>(server);
   if (enabled) {
     devtools_server->Start();
   } else {
     devtools_server->Stop();
   }
 }