[DevTools] Remove Browser domain, switch clients to Target.

headless/lib/browser/headless_devtools_manager_delegate.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 "headless/lib/browser/headless_devtools_manager_delegate.h"
 
 #include <string>
 #include <utility>
 
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/devtools_agent_host.h"
 #include "content/public/browser/devtools_frontend_host.h"
 #include "content/public/browser/web_contents.h"
 #include "headless/grit/headless_lib_resources.h"
 #include "headless/lib/browser/headless_browser_context_impl.h"
 #include "headless/lib/browser/headless_browser_impl.h"
 #include "headless/lib/browser/headless_web_contents_impl.h"
-#include "headless/public/domains/browser.h"
+#include "headless/public/domains/target.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace headless {
 
 HeadlessDevToolsManagerDelegate::HeadlessDevToolsManagerDelegate(
     base::WeakPtr<HeadlessBrowserImpl> browser)
     : browser_(std::move(browser)), default_browser_context_(nullptr) {
-  command_map_["Browser.createTarget"] =
+  command_map_["Target.createTarget"] =
       &HeadlessDevToolsManagerDelegate::CreateTarget;
-  command_map_["Browser.closeTarget"] =
+  command_map_["Target.closeTarget"] =
       &HeadlessDevToolsManagerDelegate::CloseTarget;
-  command_map_["Browser.createBrowserContext"] =
+  command_map_["Target.createBrowserContext"] =
       &HeadlessDevToolsManagerDelegate::CreateBrowserContext;
-  command_map_["Browser.disposeBrowserContext"] =
+  command_map_["Target.disposeBrowserContext"] =
       &HeadlessDevToolsManagerDelegate::DisposeBrowserContext;
 }
 
 HeadlessDevToolsManagerDelegate::~HeadlessDevToolsManagerDelegate() {}
 
 base::DictionaryValue* HeadlessDevToolsManagerDelegate::HandleCommand(
     content::DevToolsAgentHost* agent_host,
     base::DictionaryValue* command) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
@@ skipping 53 matching lines @@
     }
     context = default_browser_context_;
   }
 
   HeadlessWebContentsImpl* web_contents_impl =
       HeadlessWebContentsImpl::From(context->CreateWebContentsBuilder()
                                         .SetInitialURL(GURL(url))
                                         .SetWindowSize(gfx::Size(width, height))
                                         .Build());
 
-  return browser::CreateTargetResult::Builder()
+  return target::CreateTargetResult::Builder()
       .SetTargetId(web_contents_impl->GetDevToolsAgentHostId())
       .Build()
       ->Serialize();
 }
 
 std::unique_ptr<base::Value> HeadlessDevToolsManagerDelegate::CloseTarget(
     const base::DictionaryValue* params) {
   std::string target_id;
   if (!params->GetString("targetId", &target_id)) {
     return nullptr;
   }
   HeadlessWebContents* web_contents =
       browser_->GetWebContentsForDevToolsAgentHostId(target_id);
   bool success = false;
   if (web_contents) {
     web_contents->Close();
     success = true;
   }
-  return browser::CloseTargetResult::Builder()
+  return target::CloseTargetResult::Builder()
       .SetSuccess(success)
       .Build()
       ->Serialize();
 }
 
 std::unique_ptr<base::Value>
 HeadlessDevToolsManagerDelegate::CreateBrowserContext(
     const base::DictionaryValue* params) {
   HeadlessBrowserContext* browser_context =
       browser_->CreateBrowserContextBuilder().Build();
 
   std::unique_ptr<base::DictionaryValue> result(new base::DictionaryValue());
-  return browser::CreateBrowserContextResult::Builder()
+  return target::CreateBrowserContextResult::Builder()
       .SetBrowserContextId(browser_context->Id())
       .Build()
       ->Serialize();
 }
 
 std::unique_ptr<base::Value>
 HeadlessDevToolsManagerDelegate::DisposeBrowserContext(
     const base::DictionaryValue* params) {
   std::string browser_context_id;
   if (!params->GetString("browserContextId", &browser_context_id)) {
     return nullptr;
   }
   HeadlessBrowserContext* context =
       browser_->GetBrowserContextForId(browser_context_id);
 
   bool success = false;
   if (context && context != default_browser_context_ &&
       context->GetAllWebContents().empty()) {
     success = true;
     context->Close();
   }
 
-  return browser::DisposeBrowserContextResult::Builder()
+  return target::DisposeBrowserContextResult::Builder()
       .SetSuccess(success)
       .Build()
       ->Serialize();
 }
 
 }  // namespace headless