summaryrefslogtreecommitdiffstats
path: root/net/proxy/proxy_resolver_v8_tracing.cc
diff options
context:
space:
mode:
authorrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-01 00:39:50 +0000
committerrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-01 00:39:50 +0000
commit90499486eb26f12da3456f01bd28abc4a6191ea4 (patch)
treeaa97aa55048b94b328a11621f0dc73a2622c06e8 /net/proxy/proxy_resolver_v8_tracing.cc
parenta9030b828efc3b1312264875c1f76b35708eb000 (diff)
downloadchromium_src-90499486eb26f12da3456f01bd28abc4a6191ea4.zip
chromium_src-90499486eb26f12da3456f01bd28abc4a6191ea4.tar.gz
chromium_src-90499486eb26f12da3456f01bd28abc4a6191ea4.tar.bz2
Update net/ to use scoped_refptr<T>::get() rather than implicit "operator T*"
Linux fixes BUG=110610 TBR=darin Review URL: https://chromiumcodereview.appspot.com/15829004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203535 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy/proxy_resolver_v8_tracing.cc')
-rw-r--r--net/proxy/proxy_resolver_v8_tracing.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/proxy/proxy_resolver_v8_tracing.cc b/net/proxy/proxy_resolver_v8_tracing.cc
index 65fe482..9959ce15 100644
--- a/net/proxy/proxy_resolver_v8_tracing.cc
+++ b/net/proxy/proxy_resolver_v8_tracing.cc
@@ -1077,7 +1077,7 @@ ProxyResolverV8Tracing::ProxyResolverV8Tracing(
ProxyResolverV8Tracing::~ProxyResolverV8Tracing() {
// Note, all requests should have been cancelled.
- CHECK(!set_pac_script_job_);
+ CHECK(!set_pac_script_job_.get());
CHECK_EQ(0, num_outstanding_callbacks_);
// Join the worker thread. See http://crbug.com/69710. Note that we call
@@ -1094,7 +1094,7 @@ int ProxyResolverV8Tracing::GetProxyForURL(const GURL& url,
const BoundNetLog& net_log) {
DCHECK(CalledOnValidThread());
DCHECK(!callback.is_null());
- DCHECK(!set_pac_script_job_);
+ DCHECK(!set_pac_script_job_.get());
scoped_refptr<Job> job = new Job(this);
@@ -1116,7 +1116,7 @@ LoadState ProxyResolverV8Tracing::GetLoadState(RequestHandle request) const {
}
void ProxyResolverV8Tracing::CancelSetPacScript() {
- DCHECK(set_pac_script_job_);
+ DCHECK(set_pac_script_job_.get());
set_pac_script_job_->Cancel();
set_pac_script_job_ = NULL;
}
@@ -1139,7 +1139,7 @@ int ProxyResolverV8Tracing::SetPacScript(
// Note that there should not be any outstanding (non-cancelled) Jobs when
// setting the PAC script (ProxyService should guarantee this). If there are,
// then they might complete in strange ways after the new script is set.
- DCHECK(!set_pac_script_job_);
+ DCHECK(!set_pac_script_job_.get());
CHECK_EQ(0, num_outstanding_callbacks_);
set_pac_script_job_ = new Job(this);