Moved dev tools initialization bit earlier for ChromeOS browser start.

chrome/browser/chromeos/chrome_browser_main_chromeos.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/chromeos/chrome_browser_main_chromeos.h"
 
 #include <string>
 #include <vector>
 
 #include "ash/shell.h"
@@ skipping 68 matching lines @@
 #include "chromeos/cryptohome/async_method_caller.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager_client.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "chromeos/disks/disk_mount_manager.h"
 #include "chromeos/display/output_configurator.h"
 #include "chromeos/network/network_event_log.h"
 #include "chromeos/network/network_state_handler.h"
 #include "chromeos/power/power_state_override.h"
 #include "content/public/browser/notification_service.h"
+#include "content/public/common/content_switches.h"
 #include "content/public/common/main_function_params.h"
 #include "grit/platform_locale_settings.h"
 #include "net/base/network_change_notifier.h"
 #include "net/url_request/url_request.h"
 
 namespace chromeos {
 
 namespace {
 
 class MessageLoopObserver : public MessageLoopForUI::Observer {
@@ skipping 63 matching lines @@
     LoginUtils::Get()->DoBrowserLaunch(profile, NULL);
     if (!pending_requests_)
       delete this;
   }
 
   scoped_refptr<Authenticator> authenticator_;
   bool pending_requests_;
   bool profile_prepared_;
 };
 
+void LaunchDevToolsHandlerIfNeeded(Profile* profile,
+                                   const CommandLine& command_line) {
+  if (command_line.HasSwitch(::switches::kRemoteDebuggingPort)) {
+    std::string port_str =
+        command_line.GetSwitchValueASCII(::switches::kRemoteDebuggingPort);
+    int64 port;
+    if (base::StringToInt64(port_str, &port) && port > 0 && port < 65535) {

[sky, 2012/12/04 00:10:53]

Use StringToInt (avoids cast on 188).

[zel, 2012/12/04 02:12:28]

Done.

+      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",
+          static_cast<int>(port),
+          frontend_str);
+    } else {
+      DLOG(WARNING) << "Invalid http debugger port number " << port;
+    }
+  }
+}
+
 void OptionallyRunChromeOSLoginManager(const CommandLine& parsed_command_line,
                                        Profile* profile) {
   if (parsed_command_line.HasSwitch(::switches::kLoginManager)) {
     std::string first_screen =
         parsed_command_line.GetSwitchValueASCII(::switches::kLoginScreen);
     std::string size_arg =
         parsed_command_line.GetSwitchValueASCII(
             ::switches::kLoginScreenSize);
     gfx::Size size(0, 0);
     // Allow the size of the login window to be set explicitly. If not set,
@@ skipping 314 matching lines @@
     const PrefService::Preference* use_shared_proxies_pref =
         profile()->GetPrefs()->FindPreference(prefs::kUseSharedProxies);
     if (use_shared_proxies_pref->IsDefaultValue())
       profile()->GetPrefs()->SetBoolean(prefs::kUseSharedProxies, false);
   }
 
   // Make sure the NetworkConfigurationUpdater is ready so that it pushes ONC
   // configuration before login.
   connector->GetNetworkConfigurationUpdater();
 
-  // Make sure that wallpaper boot transition and other delays in OOBE
-  // are disabled for tests by default.
-  // Individual tests may enable them if they want.
-  if (parsed_command_line().HasSwitch(::switches::kTestType))
+  if (parsed_command_line().HasSwitch(::switches::kTestType)) {
+    // Make sure that wallpaper boot transition and other delays in OOBE
+    // are disabled for tests by default.
+    // Individual tests may enable them if they want.
     WizardController::SetZeroDelays();
+  }
+
+  // Start dev tools protocol handler.
+  LaunchDevToolsHandlerIfNeeded(profile(), parsed_command_line());
 
   // Tests should be able to tune login manager before showing it.
   // Thus only show login manager in normal (non-testing) mode.
   if (!parameters().ui_task)
     OptionallyRunChromeOSLoginManager(parsed_command_line(), profile());
 
   // These observers must be initialized after the profile because
   // they use the profile to dispatch extension events.
   //
   // Initialize the brightness observer so that we'll display an onscreen
@@ skipping 181 matching lines @@
     } else if (trial->group() == margin_200mb) {
       LOG(WARNING) << "low_mem: Part of '200MB' experiment";
       LowMemoryObserver::SetLowMemoryMargin(200);
     } else {
       LOG(WARNING) << "low_mem: Part of 'default' experiment";
     }
   }
 }
 
 }  //  namespace chromeos