commit 90499486eb26f12da3456f01bd28abc4a6191ea4
author rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Sat Jun 01 00:39:50 2013
committer rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Sat Jun 01 00:39:50 2013
tree aa97aa55048b94b328a11621f0dc73a2622c06e8
parent a9030b828efc3b1312264875c1f76b35708eb000

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

net/dns/host_resolver_impl.cc

diff --git a/net/dns/host_resolver_impl.cc b/net/dns/host_resolver_impl.cc
index 0f00ceb2..7845e0b 100644
--- a/net/dns/host_resolver_impl.cc
+++ b/net/dns/host_resolver_impl.cc
@@ -562,10 +562,10 @@
         completed_attempt_error_(ERR_UNEXPECTED),
         had_non_speculative_request_(false),
         net_log_(job_net_log) {
-    if (!params_.resolver_proc)
+    if (!params_.resolver_proc.get())
       params_.resolver_proc = HostResolverProc::GetDefault();
     // If default is unset, use the system proc.
-    if (!params_.resolver_proc)
+    if (!params_.resolver_proc.get())
       params_.resolver_proc = new SystemHostResolverProc();
   }
 
@@ -1260,7 +1260,7 @@
     // TODO(szym): Check if this is still needed.
     if (!req->info().is_speculative()) {
       had_non_speculative_request_ = true;
-      if (proc_task_)
+      if (proc_task_.get())
         proc_task_->set_had_non_speculative_request();
     }
 
@@ -2202,9 +2202,8 @@
   // ScopedDefaultHostResolverProc.
   // The alternative is to use NetworkChangeNotifier to override DnsConfig,
   // but that would introduce construction order requirements for NCN and SDHRP.
-  return (dns_client_.get() != NULL) &&
-         (dns_client_->GetConfig() != NULL) &&
-         !(proc_params_.resolver_proc == NULL &&
+  return (dns_client_.get() != NULL) && (dns_client_->GetConfig() != NULL) &&
+         !(proc_params_.resolver_proc.get() == NULL &&
            HostResolverProc::GetDefault() != NULL);
 }