[DevTools] Migrate android to devtools_discovery.

chrome/browser/chrome_browser_main.cc

Index: chrome/browser/chrome_browser_main.cc
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index 3b2414fd206958fdbe18418b0a8194401758191a..df9fc77977c33a0ce545297231bd8eb29abc6bf7 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -144,6 +144,7 @@
 #include "ui/strings/grit/app_locale_settings.h"
 
 #if defined(OS_ANDROID)
+#include "chrome/browser/android/dev_tools_discovery_provider_android.h"
 #include "chrome/browser/metrics/thread_watcher_android.h"
 #else
 #include "chrome/browser/feedback/feedback_profile_observer.h"
@@ -516,6 +517,12 @@ bool ProcessSingletonNotificationCallback(
 }
 #endif  // !defined(OS_ANDROID)
 
+void SetUpDevToolsDiscovery() {
+#if defined(OS_ANDROID)

[jochen (gone - plz use gerrit), 2015/04/27 19:38:57]

why not just inline this in PostProfileInit?

[dgozman, 2015/04/28 09:27:06]

Inlined.

+  DevToolsDiscoveryProviderAndroid::Install();
+#endif  // defined(OS_ANDROID)
+}
+
 void LaunchDevToolsHandlerIfNeeded(const base::CommandLine& command_line) {
   if (command_line.HasSwitch(::switches::kRemoteDebuggingPort)) {
     std::string port_str =
@@ -1092,6 +1099,7 @@ void ChromeBrowserMainParts::PreProfileInit() {
 
 void ChromeBrowserMainParts::PostProfileInit() {
   TRACE_EVENT0("startup", "ChromeBrowserMainParts::PostProfileInit");
+  SetUpDevToolsDiscovery();
   LaunchDevToolsHandlerIfNeeded(parsed_command_line());
   for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
     chrome_extra_parts_[i]->PostProfileInit();