DevTools: merge devtools target with devtools host, part 1

content/browser/devtools/protocol/browser_handler.cc

Index: content/browser/devtools/protocol/browser_handler.cc
diff --git a/content/browser/devtools/protocol/browser_handler.cc b/content/browser/devtools/protocol/browser_handler.cc
index 5f0634bdb9c034c3ac484efaf4ef5910edea0e10..d1494f06ca86738a56b61c3991609ab74ac51099 100644
--- a/content/browser/devtools/protocol/browser_handler.cc
+++ b/content/browser/devtools/protocol/browser_handler.cc
@@ -8,14 +8,6 @@ namespace content {
 namespace devtools {
 namespace browser {
 
-namespace {
-const char kTargetTypeWebContents[] = "web_contents";

[dgozman, 2016/08/22 23:09:07]

Headless tests will fail.

-const char kTargetTypeFrame[] = "frame";
-const char kTargetTypeSharedWorker[] = "shared_worker";
-const char kTargetTypeServiceWorker[] = "service_worker";
-const char kTargetTypeServiceOther[] = "other";
-}
-
 using Response = DevToolsProtocolClient::Response;
 
 BrowserHandler::BrowserHandler() {
@@ -28,21 +20,6 @@ void BrowserHandler::SetClient(std::unique_ptr<Client> client) {
   client_.swap(client);
 }
 
-static std::string GetTypeString(DevToolsAgentHost* agent_host) {
-  switch (agent_host->GetType()) {
-    case DevToolsAgentHost::TYPE_WEB_CONTENTS:
-      return kTargetTypeWebContents;
-    case DevToolsAgentHost::TYPE_FRAME:
-      return kTargetTypeFrame;
-    case DevToolsAgentHost::TYPE_SHARED_WORKER:
-      return kTargetTypeSharedWorker;
-    case DevToolsAgentHost::TYPE_SERVICE_WORKER:
-      return kTargetTypeServiceWorker;
-    default:
-      return kTargetTypeServiceOther;
-  }
-}
-
 Response BrowserHandler::CreateBrowserContext(std::string* out_context_id) {
   // For layering reasons this needs to be handled by
   // DevToolsManagerDelegate::HandleCommand.
@@ -84,7 +61,7 @@ Response BrowserHandler::GetTargets(TargetInfos* infos) {
     scoped_refptr<devtools::browser::TargetInfo> info =
         devtools::browser::TargetInfo::Create()->
             set_target_id(agent_host->GetId())->
-            set_type(GetTypeString(agent_host))->
+            set_type(agent_host->GetType())->
             set_title(agent_host->GetTitle())->
             set_url(agent_host->GetURL().spec());
     infos->push_back(info);