Moved dev tools initialization bit earlier for ChromeOS browser start.

chrome/browser/chrome_browser_main.cc

 // Copyright (c) 2012 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/chrome_browser_main.h"
 
 #if defined(TOOLKIT_GTK)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 86 matching lines @@
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/metrics/variations/variations_util.h"
 #include "chrome/common/net/net_resource_provider.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/profiling.h"
 #include "chrome/common/startup_metric_utils.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/content_client.h"
+#include "content/public/common/content_switches.h"
 #include "content/public/common/main_function_params.h"
 #include "grit/app_locale_settings.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/platform_locale_settings.h"
 #include "net/base/net_module.h"
 #include "net/base/sdch_manager.h"
 #include "net/cookies/cookie_monster.h"
 #include "net/http/http_network_layer.h"
@@ skipping 295 matching lines @@
   StartupBrowserCreator::ProcessCommandLineAlreadyRunning(
       command_line, current_directory);
   return true;
 }
 
 bool HasImportSwitch(const CommandLine& command_line) {
   return (command_line.HasSwitch(switches::kImport) ||
           command_line.HasSwitch(switches::kImportFromFile));
 }
 
+void LaunchDevToolsHandlerIfNeeded(Profile* profile,
+                                   const CommandLine& command_line) {
+  if (command_line.HasSwitch(::switches::kRemoteDebuggingPort)) {
+    std::string port_str =
+        command_line.GetSwitchValueASCII(::switches::kRemoteDebuggingPort);
+    int port;
+    if (base::StringToInt(port_str, &port) && port > 0 && port < 65535) {
+      std::string frontend_str;
+      if (command_line.HasSwitch(::switches::kRemoteDebuggingFrontend)) {
+        frontend_str = command_line.GetSwitchValueASCII(
+            ::switches::kRemoteDebuggingFrontend);
+      }
+      g_browser_process->CreateDevToolsHttpProtocolHandler(
+          profile,
+          "127.0.0.1",
+          port,
+          frontend_str);
+    } else {
+      DLOG(WARNING) << "Invalid http debugger port number " << port;
+    }
+  }
+}
+
 #if defined(ENABLE_RLZ)
 bool IsGoogleUrl(const GURL& url) {
   return google_util::IsGoogleHomePageUrl(url.possibly_invalid_spec());
 }
 #endif
 
 }  // namespace
 
 namespace chrome_browser {
 // This error message is not localized because we failed to load the
@@ skipping 422 matching lines @@
 //   PreBrowserStart()
 //   ... browser_creator_->Start (OR parameters().ui_task->Run())
 //   PostBrowserStart()
 
 void ChromeBrowserMainParts::PreProfileInit() {
   for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
     chrome_extra_parts_[i]->PreProfileInit();
 }
 
 void ChromeBrowserMainParts::PostProfileInit() {
+  LaunchDevToolsHandlerIfNeeded(profile(), parsed_command_line());

[Nikita (slow), 2012/12/05 14:06:04]

This part isn't reached on ChromeOS build.

#0  chromeos::ChromeBrowserMainPartsChromeos::PostProfileInit
(this=0x7fffe17abb80)
    at ../../chrome/browser/chromeos/chrome_browser_main_chromeos.cc:484
#1  0x00007ffff6b26ced in ChromeBrowserMainParts::PreMainMessageLoopRunImpl
(this=0x7fffe17abb80)
    at ../../chrome/browser/chrome_browser_main.cc:1158

then

#0  ChromeBrowserMainPartsLinux::PostProfileInit (this=0x7fffe17abb80)
    at ../../chrome/browser/chrome_browser_main_linux.cc:126
#1  0x00007ffff6095141 in
chromeos::ChromeBrowserMainPartsChromeos::PostProfileInit (this=0x7fffe17abb80)
    at ../../chrome/browser/chromeos/chrome_browser_main_chromeos.cc:551
#2  0x00007ffff6b26ced in ChromeBrowserMainParts::PreMainMessageLoopRunImpl
(this=0x7fffe17abb80)
    at ../../chrome/browser/chrome_browser_main.cc:1158

and ChromeBrowserMainPartsLinux::PostProfileInit() doesn't call base class
(ChromeBrowserMainPartsPosix) implementation.

void ChromeBrowserMainPartsLinux::PostProfileInit() {
  media_transfer_protocol_device_observer_.reset(
      new chrome::MediaTransferProtocolDeviceObserverLinux());
}

[stevenjb, 2012/12/05 17:35:23]

Yikes! Good thing that (until now) PostProfileInit() only had a
ChromeBrowserMainPartsChromeos implementation. That's my bad, sorry about that!

   for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
     chrome_extra_parts_[i]->PostProfileInit();
 }
 
 void ChromeBrowserMainParts::PreInteractiveFirstRunInit() {
   for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
     chrome_extra_parts_[i]->PreInteractiveFirstRunInit();
 }
 
 void ChromeBrowserMainParts::PostInteractiveFirstRunInit() {
@@ skipping 776 matching lines @@
     if (base::win::GetVersion() <= base::win::VERSION_XP)
       uma_name += "_XP";
 
     uma_name += "_PreRead_";
     uma_name += pre_read_percentage;
     AddPreReadHistogramTime(uma_name.c_str(), time);
   }
 #endif
 #endif
 }