Remove implicit conversions from scoped_refptr to T* in google_apis/

This patch was generated by running the rewrite_scoped_refptr clang tool
on a Linux build.

BUG=110610
R=rogerta@chromium.org

Review URL: https://codereview.chromium.org/498123003

Cr-Commit-Position: refs/heads/master@{#291821}

12 files changed, 30 insertions, 30 deletions

diff --git a/google_apis/drive/auth_service.cc b/google_apis/drive/auth_service.cc
index 0ab8fdf..49fe38a 100644
--- a/google_apis/drive/auth_service.cc
+++ b/google_apis/drive/auth_service.cc
@@ -149,7 +149,7 @@ void AuthService::StartAuthentication(const AuthStatusCallback& callback) {
     // We have refresh token, let's get an access token.
     new AuthRequest(oauth2_token_service_,
                     account_id_,
-                    url_request_context_getter_,
+                    url_request_context_getter_.get(),
                     base::Bind(&AuthService::OnAuthCompleted,
                                weak_ptr_factory_.GetWeakPtr(),
                                callback),
diff --git a/google_apis/drive/request_sender.h b/google_apis/drive/request_sender.h
index dfc671c..be76b99 100644
--- a/google_apis/drive/request_sender.h
+++ b/google_apis/drive/request_sender.h
@@ -53,7 +53,7 @@ class RequestSender {
   AuthServiceInterface* auth_service() { return auth_service_.get(); }
 
   net::URLRequestContextGetter* url_request_context_getter() const {
-    return url_request_context_getter_;
+    return url_request_context_getter_.get();
   }
 
   base::SequencedTaskRunner* blocking_task_runner() const {
diff --git a/google_apis/gaia/gaia_auth_fetcher_unittest.cc b/google_apis/gaia/gaia_auth_fetcher_unittest.cc
index 971d47d..a6203ff 100644
--- a/google_apis/gaia/gaia_auth_fetcher_unittest.cc
+++ b/google_apis/gaia/gaia_auth_fetcher_unittest.cc
@@ -154,11 +154,11 @@ class GaiaAuthFetcherTest : public testing::Test {
 
  protected:
   net::TestURLRequestContextGetter* GetRequestContext() {
-    if (!request_context_getter_) {
+    if (!request_context_getter_.get()) {
       request_context_getter_ = new net::TestURLRequestContextGetter(
           message_loop_.message_loop_proxy());
     }
-    return request_context_getter_;
+    return request_context_getter_.get();
   }
 
   base::MessageLoop message_loop_;
diff --git a/google_apis/gaia/gaia_oauth_client_unittest.cc b/google_apis/gaia/gaia_oauth_client_unittest.cc
index 7ca60f3..9e4bfdf 100644
--- a/google_apis/gaia/gaia_oauth_client_unittest.cc
+++ b/google_apis/gaia/gaia_oauth_client_unittest.cc
@@ -180,11 +180,11 @@ class GaiaOAuthClientTest : public testing::Test {
 
  protected:
   net::TestURLRequestContextGetter* GetRequestContext() {
-    if (!request_context_getter_) {
+    if (!request_context_getter_.get()) {
       request_context_getter_ = new net::TestURLRequestContextGetter(
           message_loop_.message_loop_proxy());
     }
-    return request_context_getter_;
+    return request_context_getter_.get();
   }
 
   base::MessageLoop message_loop_;
diff --git a/google_apis/gaia/merge_session_helper_unittest.cc b/google_apis/gaia/merge_session_helper_unittest.cc
index 144a7f1..888ec07 100644
--- a/google_apis/gaia/merge_session_helper_unittest.cc
+++ b/google_apis/gaia/merge_session_helper_unittest.cc
@@ -76,7 +76,7 @@ class MergeSessionHelperTest : public testing::Test {
 
   OAuth2TokenService* token_service() { return &token_service_; }
   net::URLRequestContextGetter* request_context() {
-    return request_context_getter_;
+    return request_context_getter_.get();
   }
 
   void SimulateUbertokenFailure(UbertokenConsumer* consumer,
diff --git a/google_apis/gaia/oauth2_access_token_fetcher_impl_unittest.cc b/google_apis/gaia/oauth2_access_token_fetcher_impl_unittest.cc
index f263932..5b558b2 100644
--- a/google_apis/gaia/oauth2_access_token_fetcher_impl_unittest.cc
+++ b/google_apis/gaia/oauth2_access_token_fetcher_impl_unittest.cc
@@ -86,7 +86,7 @@ class OAuth2AccessTokenFetcherImplTest : public testing::Test {
   OAuth2AccessTokenFetcherImplTest()
       : request_context_getter_(new net::TestURLRequestContextGetter(
             base::MessageLoopProxy::current())),
-        fetcher_(&consumer_, request_context_getter_, "refresh_token") {
+        fetcher_(&consumer_, request_context_getter_.get(), "refresh_token") {
     base::RunLoop().RunUntilIdle();
   }
 
diff --git a/google_apis/gaia/oauth2_api_call_flow_unittest.cc b/google_apis/gaia/oauth2_api_call_flow_unittest.cc
index 754b15e..73232a9 100644
--- a/google_apis/gaia/oauth2_api_call_flow_unittest.cc
+++ b/google_apis/gaia/oauth2_api_call_flow_unittest.cc
@@ -143,9 +143,9 @@ class OAuth2ApiCallFlowTest : public testing::Test {
         new net::TestURLRequestContextGetter(
             message_loop_.message_loop_proxy());
     flow_.reset(new MockApiCallFlow(
-        request_context_getter, refresh_token, access_token, scopes));
+        request_context_getter.get(), refresh_token, access_token, scopes));
     access_token_fetcher_.reset(new MockAccessTokenFetcher(
-        flow_.get(), request_context_getter, refresh_token));
+        flow_.get(), request_context_getter.get(), refresh_token));
   }
 
   TestURLFetcher* SetupApiCall(bool succeeds, net::HttpStatusCode status) {
diff --git a/google_apis/gaia/oauth2_token_service_request.cc b/google_apis/gaia/oauth2_token_service_request.cc
index 0c737ad..1ef48c6 100644
--- a/google_apis/gaia/oauth2_token_service_request.cc
+++ b/google_apis/gaia/oauth2_token_service_request.cc
@@ -90,9 +90,9 @@ OAuth2TokenServiceRequest::Core::Core(
     const scoped_refptr<TokenServiceProvider>& provider)
     : owner_(owner), provider_(provider) {
   DCHECK(owner_);
-  DCHECK(provider_);
+  DCHECK(provider_.get());
   token_service_task_runner_ = provider_->GetTokenServiceTaskRunner();
-  DCHECK(token_service_task_runner_);
+  DCHECK(token_service_task_runner_.get());
 }
 
 OAuth2TokenServiceRequest::Core::~Core() {
@@ -132,7 +132,7 @@ bool OAuth2TokenServiceRequest::Core::IsStopped() const {
 
 base::SingleThreadTaskRunner*
 OAuth2TokenServiceRequest::Core::token_service_task_runner() {
-  return token_service_task_runner_;
+  return token_service_task_runner_.get();
 }
 
 OAuth2TokenService* OAuth2TokenServiceRequest::Core::token_service() {
@@ -365,7 +365,7 @@ OAuth2TokenServiceRequest::OAuth2TokenServiceRequest(
 }
 
 void OAuth2TokenServiceRequest::StartWithCore(const scoped_refptr<Core>& core) {
-  DCHECK(core);
+  DCHECK(core.get());
   core_ = core;
   core_->Start();
 }
diff --git a/google_apis/gcm/base/socket_stream.cc b/google_apis/gcm/base/socket_stream.cc
index 8c152c6..14889e1 100644
--- a/google_apis/gcm/base/socket_stream.cc
+++ b/google_apis/gcm/base/socket_stream.cc
@@ -101,12 +101,12 @@ net::Error SocketInputStream::Refresh(const base::Closure& callback,
   }
 
   DVLOG(1) << "Refreshing input stream, limit of " << byte_limit << " bytes.";
-  int result = socket_->Read(
-      read_buffer_,
-      byte_limit,
-      base::Bind(&SocketInputStream::RefreshCompletionCallback,
-                 weak_ptr_factory_.GetWeakPtr(),
-                 callback));
+  int result =
+      socket_->Read(read_buffer_.get(),
+                    byte_limit,
+                    base::Bind(&SocketInputStream::RefreshCompletionCallback,
+                               weak_ptr_factory_.GetWeakPtr(),
+                               callback));
   DVLOG(1) << "Read returned " << result;
   if (result == net::ERR_IO_PENDING) {
     last_error_ = net::ERR_IO_PENDING;
@@ -256,12 +256,12 @@ net::Error SocketOutputStream::Flush(const base::Closure& callback) {
   }
 
   DVLOG(1) << "Flushing " << next_pos_ << " bytes into socket.";
-  int result = socket_->Write(
-      write_buffer_,
-      next_pos_,
-      base::Bind(&SocketOutputStream::FlushCompletionCallback,
-                 weak_ptr_factory_.GetWeakPtr(),
-                 callback));
+  int result =
+      socket_->Write(write_buffer_.get(),
+                     next_pos_,
+                     base::Bind(&SocketOutputStream::FlushCompletionCallback,
+                                weak_ptr_factory_.GetWeakPtr(),
+                                callback));
   DVLOG(1) << "Write returned " << result;
   if (result == net::ERR_IO_PENDING) {
     last_error_ = net::ERR_IO_PENDING;
diff --git a/google_apis/gcm/engine/connection_factory_impl.cc b/google_apis/gcm/engine/connection_factory_impl.cc
index 4963f13..4857d2a 100644
--- a/google_apis/gcm/engine/connection_factory_impl.cc
+++ b/google_apis/gcm/engine/connection_factory_impl.cc
@@ -535,7 +535,7 @@ int ConnectionFactoryImpl::ReconsiderProxyAfterError(int error) {
 }
 
 void ConnectionFactoryImpl::ReportSuccessfulProxyConnection() {
-  if (gcm_network_session_ && gcm_network_session_->proxy_service())
+  if (gcm_network_session_.get() && gcm_network_session_->proxy_service())
     gcm_network_session_->proxy_service()->ReportSuccess(proxy_info_, NULL);
 }
 
@@ -551,7 +551,7 @@ void ConnectionFactoryImpl::CloseSocket() {
 }
 
 void ConnectionFactoryImpl::RebuildNetworkSessionAuthCache() {
-  if (!http_network_session_ || !http_network_session_->http_auth_cache())
+  if (!http_network_session_.get() || !http_network_session_->http_auth_cache())
     return;
 
   gcm_network_session_->http_auth_cache()->UpdateAllFrom(
diff --git a/google_apis/gcm/engine/registration_request.cc b/google_apis/gcm/engine/registration_request.cc
index ee9307c..baffcc7 100644
--- a/google_apis/gcm/engine/registration_request.cc
+++ b/google_apis/gcm/engine/registration_request.cc
@@ -128,7 +128,7 @@ void RegistrationRequest::Start() {
   DCHECK(!url_fetcher_.get());
   url_fetcher_.reset(net::URLFetcher::Create(
       registration_url_, net::URLFetcher::POST, this));
-  url_fetcher_->SetRequestContext(request_context_getter_);
+  url_fetcher_->SetRequestContext(request_context_getter_.get());
   url_fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES |
                              net::LOAD_DO_NOT_SAVE_COOKIES);
 
diff --git a/google_apis/gcm/engine/unregistration_request.cc b/google_apis/gcm/engine/unregistration_request.cc
index 2b8c97d..7272fc7 100644
--- a/google_apis/gcm/engine/unregistration_request.cc
+++ b/google_apis/gcm/engine/unregistration_request.cc
@@ -135,7 +135,7 @@ void UnregistrationRequest::Start() {
 
   url_fetcher_.reset(net::URLFetcher::Create(
       registration_url_, net::URLFetcher::POST, this));
-  url_fetcher_->SetRequestContext(request_context_getter_);
+  url_fetcher_->SetRequestContext(request_context_getter_.get());
 
   std::string android_id = base::Uint64ToString(request_info_.android_id);
   std::string auth_header =