Update CrOS to use scoped_refptr<T>::get() rather than implicit "operator T*"

chrome/browser/chromeos/login/oauth2_login_verifier.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/oauth2_login_verifier.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
@@ skipping 56 matching lines @@
   refresh_token_ = oauth2_refresh_token;
   gaia_token_.clear();
   StartFetchingOAuthLoginAccessToken();
 }
 
 void OAuth2LoginVerifier::StartFetchingOAuthLoginAccessToken() {
   access_token_.clear();
   gaia_token_.clear();
   std::vector<std::string> scopes;
   scopes.push_back(GaiaUrls::GetInstance()->oauth1_login_scope());
-  token_fetcher_.reset(new OAuth2AccessTokenFetcher(
-      this, system_request_context_)),
-  token_fetcher_->Start(GaiaUrls::GetInstance()->oauth2_chrome_client_id(),
-                        GaiaUrls::GetInstance()->oauth2_chrome_client_secret(),
-                        refresh_token_,
-                        scopes);
+  token_fetcher_
+      .reset(new OAuth2AccessTokenFetcher(this, system_request_context_.get())),
+      token_fetcher_
+      ->Start(GaiaUrls::GetInstance()->oauth2_chrome_client_id(),
+              GaiaUrls::GetInstance()->oauth2_chrome_client_secret(),
+              refresh_token_,
+              scopes);
 }
 
 void OAuth2LoginVerifier::OnGetTokenSuccess(
     const std::string& access_token, const base::Time& expiration_time) {
   LOG(INFO) << "Got OAuth2 access token!";
   retry_count_ = 0;
   access_token_ = access_token;
   StartOAuthLoginForUberToken();
 }
 
 void OAuth2LoginVerifier::OnGetTokenFailure(
     const GoogleServiceAuthError& error) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   LOG(ERROR) << "Failed to get OAuth2 access token, "
              << " error: " << error.state();
   RetryOnError(
       "GetOAuth2AccessToken", error,
       base::Bind(&OAuth2LoginVerifier::StartFetchingOAuthLoginAccessToken,
                  AsWeakPtr()),
       base::Bind(&Delegate::OnOAuthLoginFailure,
                  base::Unretained(delegate_)));
 }
 
 void OAuth2LoginVerifier::StartOAuthLoginForUberToken() {
   // No service will fetch us uber auth token.
-  gaia_system_fetcher_.reset(new GaiaAuthFetcher(
-      this, std::string(GaiaConstants::kChromeOSSource),
-      system_request_context_));
+  gaia_system_fetcher_.reset(
+      new GaiaAuthFetcher(this,
+                          std::string(GaiaConstants::kChromeOSSource),
+                          system_request_context_.get()));
   gaia_system_fetcher_->StartTokenFetchForUberAuthExchange(access_token_);
 }
 
 
 void OAuth2LoginVerifier::OnUberAuthTokenSuccess(
     const std::string& uber_token) {
   LOG(INFO) << "OAuthLogin(uber_token) successful!";
   retry_count_ = 0;
   gaia_token_ = uber_token;
   StartMergeSession();
 }
 
 void OAuth2LoginVerifier::OnUberAuthTokenFailure(
     const GoogleServiceAuthError& error) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   LOG(ERROR) << "OAuthLogin(uber_token) failed,"
              << " error: " << error.state();
   RetryOnError("OAuthLoginUberToken", error,
                base::Bind(&OAuth2LoginVerifier::StartOAuthLoginForUberToken,
                           AsWeakPtr()),
                base::Bind(&Delegate::OnOAuthLoginFailure,
                           base::Unretained(delegate_)));
 }
 
 void OAuth2LoginVerifier::StartOAuthLoginForGaiaCredentials() {
   // No service will fetch us uber auth token.
-  gaia_system_fetcher_.reset(new GaiaAuthFetcher(
-      this, std::string(GaiaConstants::kChromeOSSource),
-      system_request_context_));
+  gaia_system_fetcher_.reset(
+      new GaiaAuthFetcher(this,
+                          std::string(GaiaConstants::kChromeOSSource),
+                          system_request_context_.get()));
   gaia_system_fetcher_->StartOAuthLogin(access_token_, EmptyString());
 }
 
 void OAuth2LoginVerifier::OnClientLoginSuccess(
     const ClientLoginResult& gaia_credentials) {
   LOG(INFO) << "OAuthLogin(SID+LSID) successful!";
   retry_count_ = 0;
   gaia_credentials_ = gaia_credentials;
   delegate_->OnOAuthLoginSuccess(gaia_credentials_);
 }
 
 void OAuth2LoginVerifier::OnClientLoginFailure(
     const GoogleServiceAuthError& error) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   LOG(ERROR) << "OAuthLogin(SID+LSID failed),"
              << " error: " << error.state();
   RetryOnError(
       "OAuthLoginGaiaCred", error,
       base::Bind(&OAuth2LoginVerifier::StartOAuthLoginForGaiaCredentials,
                  AsWeakPtr()),
       base::Bind(&Delegate::OnOAuthLoginFailure,
                  base::Unretained(delegate_)));
 }
 
 void OAuth2LoginVerifier::StartMergeSession() {
   DCHECK(!gaia_token_.empty());
-  gaia_fetcher_.reset(new GaiaAuthFetcher(
-      this, std::string(GaiaConstants::kChromeOSSource),
-      user_request_context_));
+  gaia_fetcher_.reset(
+      new GaiaAuthFetcher(this,
+                          std::string(GaiaConstants::kChromeOSSource),
+                          user_request_context_.get()));
   gaia_fetcher_->StartMergeSession(gaia_token_);
 }
 
 void OAuth2LoginVerifier::OnMergeSessionSuccess(const std::string& data) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   LOG(INFO) << "MergeSession successful.";
   delegate_->OnSessionMergeSuccess();
   // Get GAIA credentials needed to kick off TokenService and friends.
   StartOAuthLoginForGaiaCredentials();
 }
@@ skipping 35 matching lines @@
   LOG(ERROR) << "Unrecoverable error or retry count max reached for "
              << operation_id;
   UMA_HISTOGRAM_ENUMERATION(
       base::StringPrintf("OAuth2Login.%sFailure", operation_id),
       error.state(),
       GoogleServiceAuthError::NUM_STATES);
   error_handler.Run();
 }
 
 }  // namespace chromeos