DevTools: merge devtools target with devtools host, part 1

content/browser/devtools/protocol/browser_handler.cc

 // Copyright 2016 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 "content/browser/devtools/protocol/browser_handler.h"
 
 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() {
 }
 
 BrowserHandler::~BrowserHandler() {
 }
 
 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.
   return Response::ServerError("Not supported");
 }
 
 Response BrowserHandler::DisposeBrowserContext(const std::string& context_id,
                                                bool* out_success) {
   // For layering reasons this needs to be handled by
   // DevToolsManagerDelegate::HandleCommand.
@@ skipping 21 matching lines @@
 }
 
 Response BrowserHandler::GetTargets(TargetInfos* infos) {
   DevToolsAgentHost::List agents = DevToolsAgentHost::GetOrCreateAll();
   for (DevToolsAgentHost::List::iterator it = agents.begin();
        it != agents.end(); ++it) {
     DevToolsAgentHost* agent_host = (*it).get();
     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);
   }
   return Response::OK();
 }
 
 Response BrowserHandler::Attach(const std::string& targetId) {
   scoped_refptr<DevToolsAgentHost> agent_host =
       DevToolsAgentHost::GetForId(targetId);
@@ skipping 31 matching lines @@
       set_message(message));
 }
 
 void BrowserHandler::AgentHostClosed(DevToolsAgentHost* agent_host,
                                      bool replaced_with_another_client) {
 }
 
 }  // namespace browser
 }  // namespace devtools
 }  // namespace content