| Index: chrome/browser/ui/browser_init.cc | 
| diff --git a/chrome/browser/ui/browser_init.cc b/chrome/browser/ui/browser_init.cc | 
| index 2cf9d62c23ad16b7510f36a9654591c4a56b6e93..be770c8e5ddd445d68b61179d558d5f6aa25fa19 100644 | 
| --- a/chrome/browser/ui/browser_init.cc | 
| +++ b/chrome/browser/ui/browser_init.cc | 
| @@ -604,18 +604,23 @@ bool BrowserInit::LaunchWithProfile::Launch(Profile* profile, | 
| std::string port_str = | 
| command_line_.GetSwitchValueASCII(switches::kRemoteShellPort); | 
| int64 port; | 
| -    if (base::StringToInt64(port_str, &port) && port > 0 && port < 65535) | 
| -      g_browser_process->InitDebuggerWrapper(static_cast<int>(port), false); | 
| -    else | 
| +    if (base::StringToInt64(port_str, &port) && port > 0 && port < 65535) { | 
| +      g_browser_process->InitDevToolsLegacyProtocolHandler( | 
| +          static_cast<int>(port)); | 
| +    } else { | 
| DLOG(WARNING) << "Invalid remote shell port number " << port; | 
| +    } | 
| } else 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) | 
| -      g_browser_process->InitDebuggerWrapper(static_cast<int>(port), true); | 
| -    else | 
| +    if (base::StringToInt64(port_str, &port) && port > 0 && port < 65535) { | 
| +      g_browser_process->InitDevToolsHttpProtocolHandler( | 
| +          static_cast<int>(port), | 
| +          ""); | 
| +    } else { | 
| DLOG(WARNING) << "Invalid http debugger port number " << port; | 
| +    } | 
| } | 
|  | 
| if (command_line_.HasSwitch(switches::kUserAgent)) { | 
|  |