diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-24 21:13:28 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-24 21:13:28 +0000 |
| commit | 434fff8b3cd14b1c41aea1788d33f0543eff6ad1 (patch) | |
| tree | 38bb5641357159ea91452092c9bebe241a15d5a7 /net/proxy/proxy_config_service_linux_unittest.cc | |
| parent | 31ae7abec500e5d497079745490d8ba4986b1ba2 (diff) | |
| download | chromium_src-434fff8b3cd14b1c41aea1788d33f0543eff6ad1.zip chromium_src-434fff8b3cd14b1c41aea1788d33f0543eff6ad1.tar.gz chromium_src-434fff8b3cd14b1c41aea1788d33f0543eff6ad1.tar.bz2 | |
Use base::MessageLoopProxy instead of MessageLoop in ProxyConfigServiceLinux.
This will allow using that class on the main NPAPI plugin thread in
chromoting.
BUG=124728
Review URL: http://codereview.chromium.org/10140010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133767 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy/proxy_config_service_linux_unittest.cc')
| -rw-r--r-- | net/proxy/proxy_config_service_linux_unittest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/proxy/proxy_config_service_linux_unittest.cc b/net/proxy/proxy_config_service_linux_unittest.cc index f8e2238..ad12ea6 100644 --- a/net/proxy/proxy_config_service_linux_unittest.cc +++ b/net/proxy/proxy_config_service_linux_unittest.cc @@ -175,7 +175,7 @@ class MockSettingGetter values = zero_values; } - virtual bool Init(MessageLoop* glib_default_loop, + virtual bool Init(base::MessageLoopProxy* glib_default_loop, MessageLoopForIO* file_loop) OVERRIDE { return true; } @@ -187,7 +187,7 @@ class MockSettingGetter return true; } - virtual MessageLoop* GetNotificationLoop() OVERRIDE { + virtual base::MessageLoopProxy* GetNotificationLoop() OVERRIDE { return NULL; } @@ -292,7 +292,7 @@ class SynchConfigGetter { DCHECK_EQ(MessageLoop::TYPE_IO, file_loop->type()); // We pass the mock IO thread as both the IO and file threads. config_service_->SetupAndFetchInitialConfig( - MessageLoop::current(), io_thread_.message_loop(), + base::MessageLoopProxy::current(), io_thread_.message_loop_proxy(), static_cast<MessageLoopForIO*>(file_loop)); } // Synchronously gets the proxy config. |