| Index: chrome/test/testing_browser_process.cc
|
| diff --git a/chrome/test/testing_browser_process.cc b/chrome/test/testing_browser_process.cc
|
| index 15db0bebddb2e76c595f36181993d0c797289393..f6d265e7c08ccb6e758afec2bf0e6a05f515b1b5 100644
|
| --- a/chrome/test/testing_browser_process.cc
|
| +++ b/chrome/test/testing_browser_process.cc
|
| @@ -71,6 +71,12 @@ WatchDogThread* TestingBrowserProcess::watchdog_thread() {
|
| return NULL;
|
| }
|
|
|
| +#if defined(OS_CHROMEOS)
|
| +base::Thread* TestingBrowserProcess::web_socket_proxy_thread() {
|
| + return NULL;
|
| +}
|
| +#endif
|
| +
|
| ProfileManager* TestingBrowserProcess::profile_manager() {
|
| return profile_manager_.get();
|
| }
|
|
|