[DevTools] Migrate android to devtools_discovery.

content/shell/browser/shell_devtools_manager_delegate.cc

 // Copyright 2013 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/shell/browser/shell_devtools_manager_delegate.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 114 matching lines @@
       port = static_cast<uint16>(temp_port);
     } else {
       DLOG(WARNING) << "Invalid http debugger port number " << temp_port;
     }
   }
   return scoped_ptr<DevToolsHttpHandler::ServerSocketFactory>(
       new TCPServerSocketFactory("127.0.0.1", port));
 #endif
 }
 
+scoped_ptr<devtools_discovery::DevToolsTargetDescriptor>
+CreateNewShellTarget(BrowserContext* browser_context, const GURL& url) {
+  Shell* shell = Shell::CreateNewWindow(browser_context,
+                                        url,
+                                        nullptr,
+                                        gfx::Size());
+  return make_scoped_ptr(new devtools_discovery::BasicTargetDescriptor(
+      DevToolsAgentHost::GetOrCreateFor(shell->web_contents())));
+}
+
 // ShellDevToolsDelegate ----------------------------------------------------
 
 class ShellDevToolsDelegate :
     public devtools_http_handler::DevToolsHttpHandlerDelegate {
  public:
   explicit ShellDevToolsDelegate(BrowserContext* browser_context);
   ~ShellDevToolsDelegate() override;
 
   // devtools_http_handler::DevToolsHttpHandlerDelegate implementation.
   std::string GetDiscoveryPageHTML() override;
   std::string GetFrontendResource(const std::string& path) override;
 
  private:
   BrowserContext* browser_context_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellDevToolsDelegate);
 };
 
 ShellDevToolsDelegate::ShellDevToolsDelegate(BrowserContext* browser_context)
     : browser_context_(browser_context) {
+  devtools_discovery::DevToolsDiscoveryManager::GetInstance()->
+      SetCreateCallback(base::Bind(&CreateNewShellTarget,
+                                   base::Unretained(browser_context)));
 }
 
 ShellDevToolsDelegate::~ShellDevToolsDelegate() {
+  devtools_discovery::DevToolsDiscoveryManager::GetInstance()->
+      SetCreateCallback(
+          devtools_discovery::DevToolsDiscoveryManager::CreateCallback());
 }
 
 std::string ShellDevToolsDelegate::GetDiscoveryPageHTML() {
 #if defined(OS_ANDROID)
   return std::string();
 #else
   return ResourceBundle::GetSharedInstance().GetRawDataResource(
       IDR_CONTENT_SHELL_DEVTOOLS_DISCOVERY_PAGE).as_string();
 #endif
 }
@@ skipping 40 matching lines @@
   return NULL;
 }
 
 std::string ShellDevToolsManagerDelegate::GetPageThumbnailData(
     const GURL& url) {
   return std::string();
 }
 
 scoped_ptr<DevToolsTarget>
 ShellDevToolsManagerDelegate::CreateNewTarget(const GURL& url) {
-  Shell* shell = Shell::CreateNewWindow(browser_context_,
-                                        url,
-                                        NULL,
-                                        gfx::Size());
-  return scoped_ptr<DevToolsTarget>(
-      new devtools_discovery::BasicTargetDescriptor(
-          DevToolsAgentHost::GetOrCreateFor(shell->web_contents())));
+  devtools_discovery::DevToolsDiscoveryManager* discovery_manager =
+      devtools_discovery::DevToolsDiscoveryManager::GetInstance();
+  return discovery_manager->CreateNew(url);
 }
 
 void ShellDevToolsManagerDelegate::EnumerateTargets(TargetCallback callback) {
   TargetList targets;
   devtools_discovery::DevToolsDiscoveryManager* discovery_manager =
       devtools_discovery::DevToolsDiscoveryManager::GetInstance();
   for (const auto& descriptor : discovery_manager->GetDescriptors())
     targets.push_back(descriptor);
   callback.Run(targets);
 }
 
 }  // namespace content