3 files changed, 12 insertions, 11 deletions
diff --git a/net/proxy/mock_proxy_resolver.h b/net/proxy/mock_proxy_resolver.h
index 8f78c91..fc2422c 100644
--- a/net/proxy/mock_proxy_resolver.h
+++ b/net/proxy/mock_proxy_resolver.h
@@ -12,7 +12,9 @@
 #include "net/base/net_errors.h"
 #include "net/proxy/proxy_resolver.h"
 
+namespace base {
 class MessageLoop;
+}
 
 namespace net {
 
@@ -42,7 +44,7 @@ class MockAsyncProxyResolverBase : public ProxyResolver {
     const GURL url_;
     ProxyInfo* results_;
     net::CompletionCallback callback_;
-    MessageLoop* origin_loop_;
+    base::MessageLoop* origin_loop_;
   };
 
   class SetPacScriptRequest {
@@ -61,7 +63,7 @@ class MockAsyncProxyResolverBase : public ProxyResolver {
     MockAsyncProxyResolverBase* resolver_;
     const scoped_refptr<ProxyResolverScriptData> script_data_;
     net::CompletionCallback callback_;
-    MessageLoop* origin_loop_;
+    base::MessageLoop* origin_loop_;
   };
 
   typedef std::vector<scoped_refptr<Request> > RequestsList;
diff --git a/net/proxy/proxy_config_service_linux.h b/net/proxy/proxy_config_service_linux.h
index 8d46d99..8bae4c8 100644
--- a/net/proxy/proxy_config_service_linux.h
+++ b/net/proxy/proxy_config_service_linux.h
@@ -19,9 +19,8 @@
 #include "net/proxy/proxy_config_service.h"
 #include "net/proxy/proxy_server.h"
 
-class MessageLoopForIO;
-
 namespace base {
+class MessageLoopForIO;
 class SingleThreadTaskRunner;
 }  // namespace base
 
@@ -52,7 +51,7 @@ class NET_EXPORT_PRIVATE ProxyConfigServiceLinux : public ProxyConfigService {
     // gconf/gsettings calls or reading necessary files, depending on the
     // implementation.
     virtual bool Init(base::SingleThreadTaskRunner* glib_thread_task_runner,
-                      MessageLoopForIO* file_loop) = 0;
+                      base::MessageLoopForIO* file_loop) = 0;
 
     // Releases the gconf/gsettings client, which clears cached directories and
     // stops notifications.
@@ -183,7 +182,7 @@ class NET_EXPORT_PRIVATE ProxyConfigServiceLinux : public ProxyConfigService {
     void SetUpAndFetchInitialConfig(
         base::SingleThreadTaskRunner* glib_thread_task_runner,
         base::SingleThreadTaskRunner* io_thread_task_runner,
-        MessageLoopForIO* file_loop);
+        base::MessageLoopForIO* file_loop);
 
     // Handler for setting change notifications: fetches a new proxy
     // configuration from settings, and if this config is different
@@ -283,7 +282,7 @@ class NET_EXPORT_PRIVATE ProxyConfigServiceLinux : public ProxyConfigService {
   void SetupAndFetchInitialConfig(
       base::SingleThreadTaskRunner* glib_thread_task_runner,
       base::SingleThreadTaskRunner* io_thread_task_runner,
-      MessageLoopForIO* file_loop) {
+      base::MessageLoopForIO* file_loop) {
     delegate_->SetUpAndFetchInitialConfig(glib_thread_task_runner,
                                           io_thread_task_runner, file_loop);
   }
diff --git a/net/proxy/proxy_service.h b/net/proxy/proxy_service.h
index 6eab86a..6639911 100644
--- a/net/proxy/proxy_service.h
+++ b/net/proxy/proxy_service.h
@@ -23,9 +23,9 @@
 #include "net/proxy/proxy_server.h"
 
 class GURL;
-class MessageLoop;
 
 namespace base {
+class MessageLoop;
 class SingleThreadTaskRunner;
 }  // namespace base
 
@@ -241,7 +241,7 @@ class NET_EXPORT ProxyService : public NetworkChangeNotifier::IPAddressObserver,
   // system proxy settings.
   static ProxyConfigService* CreateSystemProxyConfigService(
       base::SingleThreadTaskRunner* io_thread_task_runner,
-      MessageLoop* file_loop);
+      base::MessageLoop* file_loop);
 
   // This method should only be used by unit tests.
   void set_stall_proxy_auto_config_delay(base::TimeDelta delay) {
@@ -407,7 +407,7 @@ class NET_EXPORT ProxyService : public NetworkChangeNotifier::IPAddressObserver,
 class NET_EXPORT SyncProxyServiceHelper
     : public base::RefCountedThreadSafe<SyncProxyServiceHelper> {
  public:
-  SyncProxyServiceHelper(MessageLoop* io_message_loop,
+  SyncProxyServiceHelper(base::MessageLoop* io_message_loop,
                          ProxyService* proxy_service);
 
   int ResolveProxy(const GURL& url,
@@ -427,7 +427,7 @@ class NET_EXPORT SyncProxyServiceHelper
 
   void OnCompletion(int result);
 
-  MessageLoop* io_message_loop_;
+  base::MessageLoop* io_message_loop_;
   ProxyService* proxy_service_;
 
   base::WaitableEvent event_;