diff options
Diffstat (limited to 'net/proxy')
| -rw-r--r-- | net/proxy/network_delegate_error_observer_unittest.cc | 29 | ||||
| -rw-r--r-- | net/proxy/proxy_config_service_linux_unittest.cc | 4 | ||||
| -rw-r--r-- | net/proxy/proxy_service_v8.cc | 5 |
3 files changed, 20 insertions, 18 deletions
diff --git a/net/proxy/network_delegate_error_observer_unittest.cc b/net/proxy/network_delegate_error_observer_unittest.cc index 881e4bf6..cb32760 100644 --- a/net/proxy/network_delegate_error_observer_unittest.cc +++ b/net/proxy/network_delegate_error_observer_unittest.cc @@ -99,13 +99,14 @@ TEST(NetworkDelegateErrorObserverTest, CallOnThread) { base::Thread thread("test_thread"); thread.Start(); TestNetworkDelegate network_delegate; - NetworkDelegateErrorObserver - observer(&network_delegate, - base::MessageLoopProxy::current()); - thread.message_loop()->PostTask( - FROM_HERE, - base::Bind(&NetworkDelegateErrorObserver::OnPACScriptError, - base::Unretained(&observer), 42, base::string16())); + NetworkDelegateErrorObserver observer( + &network_delegate, base::MessageLoopProxy::current().get()); + thread.message_loop() + ->PostTask(FROM_HERE, + base::Bind(&NetworkDelegateErrorObserver::OnPACScriptError, + base::Unretained(&observer), + 42, + base::string16())); thread.Stop(); base::MessageLoop::current()->RunUntilIdle(); ASSERT_TRUE(network_delegate.got_pac_error()); @@ -115,12 +116,14 @@ TEST(NetworkDelegateErrorObserverTest, CallOnThread) { TEST(NetworkDelegateErrorObserverTest, NoDelegate) { base::Thread thread("test_thread"); thread.Start(); - NetworkDelegateErrorObserver - observer(NULL, base::MessageLoopProxy::current()); - thread.message_loop()->PostTask( - FROM_HERE, - base::Bind(&NetworkDelegateErrorObserver::OnPACScriptError, - base::Unretained(&observer), 42, base::string16())); + NetworkDelegateErrorObserver observer( + NULL, base::MessageLoopProxy::current().get()); + thread.message_loop() + ->PostTask(FROM_HERE, + base::Bind(&NetworkDelegateErrorObserver::OnPACScriptError, + base::Unretained(&observer), + 42, + base::string16())); thread.Stop(); base::MessageLoop::current()->RunUntilIdle(); // Shouldn't have crashed until here... diff --git a/net/proxy/proxy_config_service_linux_unittest.cc b/net/proxy/proxy_config_service_linux_unittest.cc index 5f0ebee..8f1ca8c 100644 --- a/net/proxy/proxy_config_service_linux_unittest.cc +++ b/net/proxy/proxy_config_service_linux_unittest.cc @@ -292,8 +292,8 @@ class SynchConfigGetter { 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(), + base::MessageLoopProxy::current().get(), + io_thread_.message_loop_proxy().get(), static_cast<base::MessageLoopForIO*>(file_loop)); } // Synchronously gets the proxy config. diff --git a/net/proxy/proxy_service_v8.cc b/net/proxy/proxy_service_v8.cc index d5a3dd7..945719a 100644 --- a/net/proxy/proxy_service_v8.cc +++ b/net/proxy/proxy_service_v8.cc @@ -25,9 +25,8 @@ ProxyService* CreateProxyServiceUsingV8ProxyResolver( DCHECK(dhcp_proxy_script_fetcher); DCHECK(host_resolver); - ProxyResolverErrorObserver* error_observer = - new NetworkDelegateErrorObserver( - network_delegate, base::MessageLoopProxy::current()); + ProxyResolverErrorObserver* error_observer = new NetworkDelegateErrorObserver( + network_delegate, base::MessageLoopProxy::current().get()); ProxyResolver* proxy_resolver = new ProxyResolverV8Tracing(host_resolver, error_observer, net_log); |