DevTools: remove devtools_discovery (merged into content).

chrome/browser/android/dev_tools_discovery_provider_android.cc

Index: chrome/browser/android/dev_tools_discovery_provider_android.cc
diff --git a/chrome/browser/android/dev_tools_discovery_provider_android.cc b/chrome/browser/android/dev_tools_discovery_provider_android.cc
index 8850f80fac13fe2b53be157dae0aad11cc0eca79..efe8cffecca28630fad3433ac17d4825d03bb5c5 100644
--- a/chrome/browser/android/dev_tools_discovery_provider_android.cc
+++ b/chrome/browser/android/dev_tools_discovery_provider_android.cc
@@ -14,7 +14,6 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/ui/android/tab_model/tab_model.h"
 #include "chrome/browser/ui/android/tab_model/tab_model_list.h"
-#include "components/devtools_discovery/devtools_discovery_manager.h"
 #include "content/public/browser/devtools_agent_host.h"
 #include "content/public/browser/devtools_agent_host_client.h"
 #include "content/public/browser/devtools_external_agent_proxy.h"
@@ -156,36 +155,7 @@ class TabProxyDelegate : public content::DevToolsExternalAgentProxyDelegate,
   DISALLOW_COPY_AND_ASSIGN(TabProxyDelegate);
 };
 
-scoped_refptr<content::DevToolsAgentHost> CreateNewAndroidTab(const GURL& url) {
-  if (TabModelList::empty())
-    return nullptr;
-
-  TabModel* tab_model = TabModelList::get(0);
-  if (!tab_model)
-    return nullptr;
-
-  WebContents* web_contents = tab_model->CreateNewTabForDevTools(url);
-  if (!web_contents)
-    return nullptr;
-
-  TabAndroid* tab = TabAndroid::FromWebContents(web_contents);
-  if (!tab)
-    return nullptr;
-
-  return content::DevToolsAgentHost::Create(new TabProxyDelegate(
-           tab->GetAndroidId(), tab->GetTitle(), tab->GetURL()));
-}
-
-}  // namespace
-
-DevToolsDiscoveryProviderAndroid::DevToolsDiscoveryProviderAndroid() {
-}
-
-DevToolsDiscoveryProviderAndroid::~DevToolsDiscoveryProviderAndroid() {
-}
-
-content::DevToolsAgentHost::List
-DevToolsDiscoveryProviderAndroid::GetDescriptors() {
+content::DevToolsAgentHost::List GetDescriptors() {
   content::DevToolsAgentHost::List result;
 
   // Enumerate existing tabs, including the ones with no WebContents.
@@ -226,11 +196,17 @@ DevToolsDiscoveryProviderAndroid::GetDescriptors() {
   return result;
 }
 
+}  // namespace
+
+DevToolsDiscoveryProviderAndroid::DevToolsDiscoveryProviderAndroid() {
+}
+
+DevToolsDiscoveryProviderAndroid::~DevToolsDiscoveryProviderAndroid() {
+}
+
 // static
 void DevToolsDiscoveryProviderAndroid::Install() {
-  devtools_discovery::DevToolsDiscoveryManager* discovery_manager =
-      devtools_discovery::DevToolsDiscoveryManager::GetInstance();
-  discovery_manager->AddProvider(
-      base::WrapUnique(new DevToolsDiscoveryProviderAndroid()));
-  discovery_manager->SetCreateCallback(base::Bind(&CreateNewAndroidTab));
+  scoped_refptr<DevToolsDiscoveryProviderAndroid> provider =
+    new DevToolsDiscoveryProviderAndroid();

[dgozman, 2016/08/25 01:08:11]

style: 4 spaces

+  content::DevtoolsAgentHost::AddProvider(base::Bind(&GetDescriptors));
 }