diff options
| author | dilmah@chromium.org <dilmah@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-10 16:48:44 +0000 |
|---|---|---|
| committer | dilmah@chromium.org <dilmah@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-10 16:48:44 +0000 |
| commit | 2d14b373ac9ef900b12160ba64bafdcc0530f1dc (patch) | |
| tree | 52e15b1f248599722f3d29cc4a4a5ee894e5fe65 /chrome/test/testing_browser_process.cc | |
| parent | 658e883290c87808964c8fe245a4755c67b98eab (diff) | |
| download | chromium_src-2d14b373ac9ef900b12160ba64bafdcc0530f1dc.zip chromium_src-2d14b373ac9ef900b12160ba64bafdcc0530f1dc.tar.gz chromium_src-2d14b373ac9ef900b12160ba64bafdcc0530f1dc.tar.bz2 | |
Websocket to TCP proxy running in a separate thread (only on ChromeOS).
With this webproxy: authorized extensions can connect to ws://127.0.0.1:10101/tcpproxy,
pass authorization_token:hostname:port: in first frame,
then webproxy establishes TCP connection to hostname:port and forwards any subsequent
communication.
Subsequent communication between extension and webproxy is base64-encoded.
TODO(dilmah): remove this temporary solution, get rid of separate thread and listening socket,
instead provide the same functionality via hooks into websocket layer.
BUG=chromium-os:9667
TEST=Manual
Review URL: http://codereview.chromium.org/6801008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84795 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/testing_browser_process.cc')
| -rw-r--r-- | chrome/test/testing_browser_process.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/test/testing_browser_process.cc b/chrome/test/testing_browser_process.cc index 15db0be..f6d265e 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(); } |