DevTools: Extract target discovery and manipulation from DevToolsHttpHandlerImpl

chrome/browser/devtools/browser_list_tabcontents_provider.cc

Index: chrome/browser/devtools/browser_list_tabcontents_provider.cc
diff --git a/chrome/browser/devtools/browser_list_tabcontents_provider.cc b/chrome/browser/devtools/browser_list_tabcontents_provider.cc
index 1e43a493367bc87d7c4aa332ed9da65c1c5efa31..ad70a56d5a331cdf3a09c35ae2dd31aa6a1fc303 100644
--- a/chrome/browser/devtools/browser_list_tabcontents_provider.cc
+++ b/chrome/browser/devtools/browser_list_tabcontents_provider.cc
@@ -20,7 +20,12 @@
 #include "chrome/browser/ui/tab_contents/tab_contents_iterator.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_paths.h"
+#include "content/public/browser/browser_thread.h"
+#include "content/public/browser/devtools_agent_host.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/worker_service.h"
 #include "content/public/common/url_constants.h"
 #include "grit/devtools_discovery_page_resources.h"
 #include "net/socket/tcp_listen_socket.h"
@@ -28,7 +33,41 @@
 #include "ui/base/resource/resource_bundle.h"
 
 using content::DevToolsHttpHandlerDelegate;
+using content::DevToolsAgentHost;
 using content::RenderViewHost;
+using content::WebContents;
+
+namespace {
+
+const char kTargetTypeOther[] = "other";
+
+std::string GetDescription(WebContents* web_contents) {
+  Profile* profile =
+      Profile::FromBrowserContext(web_contents->GetBrowserContext());
+  if (!profile)
+    return std::string();
+
+  extensions::ExtensionHost* extension_host =
+      extensions::ExtensionSystem::Get(profile)->process_manager()->
+          GetBackgroundHostForExtension(web_contents->GetURL().host());
+
+  if (!extension_host || extension_host->host_contents() != web_contents)
+    return std::string();
+
+  return extension_host->extension()->name();
+}
+
+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;
+}
+
+}  // namespace
 
 BrowserListTabContentsProvider::BrowserListTabContentsProvider(
     chrome::HostDesktopType host_desktop_type)
@@ -70,8 +109,17 @@ base::FilePath BrowserListTabContentsProvider::GetDebugFrontendDir() {
 #endif
 }
 
+bool BrowserListTabContentsProvider::SupportsPageThumbnails() {
+  return true;
+}
+
 std::string BrowserListTabContentsProvider::GetPageThumbnailData(
-    const GURL& url) {
+    const std::string& id) {
+  WebContents* web_contents = GetWebContents(id);
+  if (!web_contents)
+    return std::string();
+
+  GURL url = web_contents->GetURL();
   for (chrome::BrowserIterator it; !it.done(); it.Next()) {
     Profile* profile = (*it)->profile();
     history::TopSites* top_sites = profile->GetTopSites();
@@ -86,54 +134,56 @@ std::string BrowserListTabContentsProvider::GetPageThumbnailData(
   return std::string();
 }
 
-RenderViewHost* BrowserListTabContentsProvider::CreateNewTarget() {
+DevToolsHttpHandlerDelegate::Target*
+BrowserListTabContentsProvider::CreateNewTarget() {
+  WebContents* web_contents;
   const BrowserList* browser_list =
       BrowserList::GetInstance(host_desktop_type_);
-
   if (browser_list->empty()) {
     chrome::NewEmptyWindow(ProfileManager::GetLastUsedProfile(),
         host_desktop_type_);
-    return browser_list->empty() ? NULL :
-           browser_list->get(0)->tab_strip_model()->GetActiveWebContents()->
-               GetRenderViewHost();
+    if (browser_list->empty())
+      return NULL;
+    web_contents =
+        browser_list->get(0)->tab_strip_model()->GetActiveWebContents();
+  } else {
+    web_contents = chrome::AddSelectedTabWithURL(
+        browser_list->get(0),
+        GURL(content::kAboutBlankURL),
+        content::PAGE_TRANSITION_LINK);
   }
-
-  content::WebContents* web_contents = chrome::AddSelectedTabWithURL(
-      browser_list->get(0),
-      GURL(content::kAboutBlankURL),
-      content::PAGE_TRANSITION_LINK);
-  return web_contents->GetRenderViewHost();
+  return Target::FromWebContents(web_contents);
 }
 
-content::DevToolsHttpHandlerDelegate::TargetType
-BrowserListTabContentsProvider::GetTargetType(content::RenderViewHost* rvh) {
-  for (TabContentsIterator it; !it.done(); it.Next())
-    if (rvh == it->GetRenderViewHost())
-      return kTargetTypeTab;
-
-  return kTargetTypeOther;
-}
-
-std::string BrowserListTabContentsProvider::GetViewDescription(
-    content::RenderViewHost* rvh) {
-  content::WebContents* web_contents =
-      content::WebContents::FromRenderViewHost(rvh);
+bool BrowserListTabContentsProvider::ActivateTarget(const std::string& id) {
+  WebContents* web_contents = GetWebContents(id);
   if (!web_contents)
-    return std::string();
-
-  Profile* profile =
-      Profile::FromBrowserContext(web_contents->GetBrowserContext());
-  if (!profile)
-    return std::string();
+    return false;
+  web_contents->GetDelegate()->ActivateContents(web_contents);
+  return true;
+}
 
-  extensions::ExtensionHost* extension_host =
-      extensions::ExtensionSystem::Get(profile)->process_manager()->
-          GetBackgroundHostForExtension(web_contents->GetURL().host());
+bool BrowserListTabContentsProvider::CloseTarget(const std::string& id) {
+  RenderViewHost* rvh = GetRenderViewHost(id);
+  if (!rvh)
+    return false;
+  rvh->ClosePage();
+  return true;
+}
 
-  if (!extension_host || extension_host->host_contents() != web_contents)
-    return std::string();
+scoped_refptr<DevToolsAgentHost> BrowserListTabContentsProvider::GetAgentHost(
+      const std::string& id) {
+  return DevToolsAgentHost::GetForId(id);
+}
 
-  return extension_host->extension()->name();
+void BrowserListTabContentsProvider::RequestTargets(TargetCallback callback) {
+  content::BrowserThread::PostTaskAndReplyWithResult(
+      content::BrowserThread::IO,
+      FROM_HERE,
+      base::Bind(&BrowserListTabContentsProvider::CollectWorkerTargets, this),
+      base::Bind(&BrowserListTabContentsProvider::RespondWithTargetList,
+                  this,
+                  callback));
 }
 
 #if defined(DEBUG_DEVTOOLS)
@@ -158,3 +208,42 @@ BrowserListTabContentsProvider::CreateSocketForTethering(
   return scoped_ptr<net::StreamListenSocket>();
 }
 #endif  // defined(DEBUG_DEVTOOLS)
+
+DevToolsHttpHandlerDelegate::TargetList
+BrowserListTabContentsProvider::CollectWorkerTargets() {
+  TargetList targets;
+  std::vector<content::WorkerService::WorkerInfo> worker_info =
+      content::WorkerService::GetInstance()->GetWorkers();
+  for (size_t i = 0; i < worker_info.size(); ++i)
+    targets.push_back(Target::FromWorkerInfo(worker_info[i]));
+  return targets;
+}
+
+void BrowserListTabContentsProvider::RespondWithTargetList(
+    TargetCallback callback, const TargetList& worker_targets) {
+  std::set<RenderViewHost*> tab_rvhs;
+  for (TabContentsIterator it; !it.done(); it.Next())
+    tab_rvhs.insert(it->GetRenderViewHost());
+
+  TargetList targets;
+
+  std::vector<RenderViewHost*> rvh_list =
+      content::DevToolsAgentHost::GetValidRenderViewHosts();
+  for (std::vector<RenderViewHost*>::iterator it = rvh_list.begin();
+       it != rvh_list.end(); ++it) {
+    bool is_tab = tab_rvhs.find(*it) != tab_rvhs.end();
+    WebContents* web_contents = WebContents::FromRenderViewHost(*it);
+    if (!web_contents)
+      continue;
+    Target* target = Target::FromWebContents(web_contents);
+    if (!is_tab) {
+      target->OverrideType(kTargetTypeOther);
+      target->OverrideDescription(GetDescription(web_contents));
+    }
+    targets.push_back(target);
+  }
+
+  targets.insert(targets.end(), worker_targets.begin(), worker_targets.end());
+
+  callback.Run(targets);
+}