summaryrefslogtreecommitdiffstats
path: root/net/proxy
diff options
context:
space:
mode:
authorrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-11 16:46:36 +0000
committerrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-11 16:46:36 +0000
commitcadac62e5c2b9f5fef59ce0326bb2cd79ffbe622 (patch)
tree7b95f103fce509de887c8c5e643604855b57c0ba /net/proxy
parent9f6e673c7f43f6ee414f72a74585dad8ebaceec3 (diff)
downloadchromium_src-cadac62e5c2b9f5fef59ce0326bb2cd79ffbe622.zip
chromium_src-cadac62e5c2b9f5fef59ce0326bb2cd79ffbe622.tar.gz
chromium_src-cadac62e5c2b9f5fef59ce0326bb2cd79ffbe622.tar.bz2
Call scoped_refptr<T>::get() rather than relying on implicit "operator T*"
This upates calls to bound temporary objects to also use get(). While it has the same semantic equivalence to the existing code, this generally represents a dangerous pattern - indeed, part of the whole motivation for this change is to make this anti-pattern very visible to authors. This change simply updates all of the call sites, to allow the "operator T*" to be removed and preventing new instances. The existing instances will then be reviewed for "suspicious" changes and updated to use/pass scoped_refptr<T> rather than T*, as appropriate. BUG=110610 TBR=darin Review URL: https://codereview.chromium.org/15984016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205560 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy')
-rw-r--r--net/proxy/network_delegate_error_observer_unittest.cc29
-rw-r--r--net/proxy/proxy_config_service_linux_unittest.cc4
-rw-r--r--net/proxy/proxy_service_v8.cc5
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);