| Index: chrome/browser/browser_main.cc
|
| diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
|
| index e33fc58e4a65bb55100e960ead1a7e16161b1c56..53cb3190e3a51f7d81af61918a190059f68241b4 100644
|
| --- a/chrome/browser/browser_main.cc
|
| +++ b/chrome/browser/browser_main.cc
|
| @@ -146,6 +146,7 @@
|
| #include "chrome/browser/chromeos/login/user_manager.h"
|
| #include "chrome/browser/chromeos/metrics_cros_settings_provider.h"
|
| #include "chrome/browser/chromeos/system_key_event_listener.h"
|
| +#include "chrome/browser/chromeos/web_socket_proxy_controller.h"
|
| #include "chrome/browser/oom_priority_manager.h"
|
| #include "chrome/browser/ui/views/browser_dialogs.h"
|
| #endif
|
| @@ -660,6 +661,9 @@ void CreateChildThreads(BrowserProcessImpl* process) {
|
| process->process_launcher_thread();
|
| process->cache_thread();
|
| process->io_thread();
|
| +#if defined(OS_CHROMEOS)
|
| + process->web_socket_proxy_thread();
|
| +#endif
|
| // Create watchdog thread after creating all other threads because it will
|
| // watch the other threads and they must be running.
|
| process->watchdog_thread();
|
|
|