Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(731)

Unified Diff: chrome/test/testing_browser_process.cc

Issue 6801008: Websocket to TCP proxy running in a separate thread (only on ChromeOS). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase+minor Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/testing_browser_process.h ('k') | content/browser/browser_thread.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
}
« no previous file with comments | « chrome/test/testing_browser_process.h ('k') | content/browser/browser_thread.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698