diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/cookies/cookie_store_test_callbacks.h | 9 | ||||
| -rw-r--r-- | net/proxy/mock_proxy_resolver.h | 6 | ||||
| -rw-r--r-- | net/proxy/proxy_config_service_linux.h | 9 | ||||
| -rw-r--r-- | net/proxy/proxy_service.h | 8 | ||||
| -rw-r--r-- | net/test/net_test_suite.h | 4 |
5 files changed, 19 insertions, 17 deletions
diff --git a/net/cookies/cookie_store_test_callbacks.h b/net/cookies/cookie_store_test_callbacks.h index 0d74b58..ad6f77e 100644 --- a/net/cookies/cookie_store_test_callbacks.h +++ b/net/cookies/cookie_store_test_callbacks.h @@ -10,9 +10,8 @@ #include "net/cookies/cookie_store.h" -class MessageLoop; - namespace base { +class MessageLoop; class Thread; } @@ -42,9 +41,9 @@ class CookieCallback { private: bool did_run_; base::Thread* run_in_thread_; - MessageLoop* run_in_loop_; - MessageLoop* parent_loop_; - MessageLoop* loop_to_quit_; + base::MessageLoop* run_in_loop_; + base::MessageLoop* parent_loop_; + base::MessageLoop* loop_to_quit_; }; // Callback implementations for the asynchronous CookieStore methods. 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_; diff --git a/net/test/net_test_suite.h b/net/test/net_test_suite.h index 32e6b02b..c8479d7 100644 --- a/net/test/net_test_suite.h +++ b/net/test/net_test_suite.h @@ -10,7 +10,9 @@ #include "build/build_config.h" #include "net/dns/mock_host_resolver.h" +namespace base { class MessageLoop; +} namespace net { class NetworkChangeNotifier; @@ -45,7 +47,7 @@ class NetTestSuite : public base::TestSuite { private: scoped_ptr<net::NetworkChangeNotifier> network_change_notifier_; - scoped_ptr<MessageLoop> message_loop_; + scoped_ptr<base::MessageLoop> message_loop_; scoped_refptr<net::RuleBasedHostResolverProc> host_resolver_proc_; net::ScopedDefaultHostResolverProc scoped_host_resolver_proc_; }; |