DevTools: merge devtools target with devtools host, part 1

chrome/browser/devtools/chrome_devtools_discovery_provider.cc

 // Copyright 2015 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/devtools/chrome_devtools_discovery_provider.h"
 
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/devtools/devtools_target_impl.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_navigator_params.h"
+#include "content/public/browser/devtools_agent_host.h"
 
 namespace {
 
 std::unique_ptr<devtools_discovery::DevToolsTargetDescriptor>
 CreateNewChromeTab(const GURL& url) {
   chrome::NavigateParams params(ProfileManager::GetLastUsedProfile(),
       url, ui::PAGE_TRANSITION_AUTO_TOPLEVEL);
   params.disposition = NEW_FOREGROUND_TAB;
   chrome::Navigate(&params);
   if (!params.target_contents)
     return std::unique_ptr<devtools_discovery::DevToolsTargetDescriptor>();
-  return DevToolsTargetImpl::CreateForTab(params.target_contents);
+
+  if (!params.target_contents)
+    return nullptr;
+  scoped_refptr<content::DevToolsAgentHost> host =
+      content::DevToolsAgentHost::GetOrCreateFor(params.target_contents);
+  return std::unique_ptr<DevToolsTargetImpl>(new DevToolsTargetImpl(host));
 }
 
 }  // namespace
 
 ChromeDevToolsDiscoveryProvider::ChromeDevToolsDiscoveryProvider() {
 }
 
 ChromeDevToolsDiscoveryProvider::~ChromeDevToolsDiscoveryProvider() {
 }
 
 devtools_discovery::DevToolsTargetDescriptor::List
 ChromeDevToolsDiscoveryProvider::GetDescriptors() {
   std::vector<DevToolsTargetImpl*> list = DevToolsTargetImpl::EnumerateAll();
   devtools_discovery::DevToolsTargetDescriptor::List result;
   result.reserve(list.size());
   for (auto* descriptor : list)
     result.push_back(descriptor);
   return result;
 }
 
 // static
 void ChromeDevToolsDiscoveryProvider::Install() {
   devtools_discovery::DevToolsDiscoveryManager* discovery_manager =
       devtools_discovery::DevToolsDiscoveryManager::GetInstance();
   discovery_manager->AddProvider(
       base::WrapUnique(new ChromeDevToolsDiscoveryProvider()));
   discovery_manager->SetCreateCallback(base::Bind(&CreateNewChromeTab));
 }