summaryrefslogtreecommitdiffstats
path: root/net/proxy/proxy_config_service_linux_unittest.cc
diff options
context:
space:
mode:
authorxhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-23 20:51:34 +0000
committerxhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-23 20:51:34 +0000
commit2da659e6279cf515940eb8a091e09e27281a97d6 (patch)
treea34e2eeea8194a16603e24149ae634cb54ddab62 /net/proxy/proxy_config_service_linux_unittest.cc
parent954f56f3aceed29573f841648168b91c1fd43074 (diff)
downloadchromium_src-2da659e6279cf515940eb8a091e09e27281a97d6.zip
chromium_src-2da659e6279cf515940eb8a091e09e27281a97d6.tar.gz
chromium_src-2da659e6279cf515940eb8a091e09e27281a97d6.tar.bz2
net: Use base::MessageLoop.
BUG=236029 R=agl@chromium.org Review URL: https://chromiumcodereview.appspot.com/14021017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201882 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.cc15
1 files changed, 8 insertions, 7 deletions
diff --git a/net/proxy/proxy_config_service_linux_unittest.cc b/net/proxy/proxy_config_service_linux_unittest.cc
index 4e9409f..75c5cf1 100644
--- a/net/proxy/proxy_config_service_linux_unittest.cc
+++ b/net/proxy/proxy_config_service_linux_unittest.cc
@@ -176,7 +176,7 @@ class MockSettingGetter
}
virtual bool Init(base::SingleThreadTaskRunner* glib_thread_task_runner,
- MessageLoopForIO* file_loop) OVERRIDE {
+ base::MessageLoopForIO* file_loop) OVERRIDE {
return true;
}
@@ -265,7 +265,7 @@ class SynchConfigGetter {
config_service_(config_service) {
// Start an IO thread.
base::Thread::Options options;
- options.message_loop_type = MessageLoop::TYPE_IO;
+ options.message_loop_type = base::MessageLoop::TYPE_IO;
io_thread_.StartWithOptions(options);
// Make sure the thread started.
@@ -288,12 +288,13 @@ class SynchConfigGetter {
// all on the calling thread (meant to be the thread with the
// default glib main loop, which is the UI thread).
void SetupAndInitialFetch() {
- MessageLoop* file_loop = io_thread_.message_loop();
- DCHECK_EQ(MessageLoop::TYPE_IO, file_loop->type());
+ base::MessageLoop* file_loop = io_thread_.message_loop();
+ DCHECK_EQ(base::MessageLoop::TYPE_IO, file_loop->type());
// We pass the mock IO thread as both the IO and file threads.
config_service_->SetupAndFetchInitialConfig(
- base::MessageLoopProxy::current(), io_thread_.message_loop_proxy(),
- static_cast<MessageLoopForIO*>(file_loop));
+ base::MessageLoopProxy::current(),
+ io_thread_.message_loop_proxy(),
+ static_cast<base::MessageLoopForIO*>(file_loop));
}
// Synchronously gets the proxy config.
net::ProxyConfigService::ConfigAvailability SyncGetLatestProxyConfig(
@@ -322,7 +323,7 @@ class SynchConfigGetter {
// [Runs on |io_thread_|] Signals |event_| on cleanup completion.
void CleanUp() {
- MessageLoop::current()->RunUntilIdle();
+ base::MessageLoop::current()->RunUntilIdle();
event_.Signal();
}