Change SigninClient::CreateGaiaAuthFetcher return type to unique_ptr

components/signin/core/browser/gaia_cookie_manager_service.cc

 // Copyright 2014 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 "components/signin/core/browser/gaia_cookie_manager_service.h"
 
 #include <stddef.h>
 
 #include <queue>
 
@@ skipping 119 matching lines @@
   }
   return base::JoinString(results, ",");
 }
 
 void GaiaCookieManagerService::ExternalCcResultFetcher::Start() {
   DCHECK(!helper_->external_cc_result_fetched_);
   m_external_cc_result_start_time_ = base::Time::Now();
 
   CleanupTransientState();
   results_.clear();
-  helper_->gaia_auth_fetcher_.reset(
-      helper_->signin_client_->CreateGaiaAuthFetcher(
-          this, helper_->GetDefaultSourceForRequest(),
-          helper_->request_context()));
+  helper_->gaia_auth_fetcher_ = helper_->signin_client_->CreateGaiaAuthFetcher(
+      this, helper_->GetDefaultSourceForRequest(), helper_->request_context());
   helper_->gaia_auth_fetcher_->StartGetCheckConnectionInfo();
 
   // Some fetches may timeout.  Start a timer to decide when the result fetcher
   // has waited long enough.
   // TODO(rogerta): I have no idea how long to wait before timing out.
   // Gaia folks say this should take no more than 2 second even in mobile.
   // This will need to be tweaked.
   timer_.Start(FROM_HERE, base::TimeDelta::FromSeconds(5), this,
                &GaiaCookieManagerService::ExternalCcResultFetcher::Timeout);
 }
@@ skipping 597 matching lines @@
   if (access_token_.empty()) {
     uber_token_fetcher_->StartFetchingToken(requests_.front().account_id());
   } else {
     uber_token_fetcher_->StartFetchingTokenWithAccessToken(
         requests_.front().account_id(), access_token_);
   }
 }
 
 void GaiaCookieManagerService::StartFetchingMergeSession() {
   DCHECK(!uber_token_.empty());
-  gaia_auth_fetcher_.reset(signin_client_->CreateGaiaAuthFetcher(
+  gaia_auth_fetcher_ = signin_client_->CreateGaiaAuthFetcher(
       this, GetSourceForRequest(requests_.front()),
-      signin_client_->GetURLRequestContext()));
+      signin_client_->GetURLRequestContext());
 
   gaia_auth_fetcher_->StartMergeSession(uber_token_,
       external_cc_result_fetcher_.GetExternalCcResult());
 }
 
 void GaiaCookieManagerService::StartFetchingLogOut() {
   DCHECK(requests_.front().request_type() == GaiaCookieRequestType::LOG_OUT);
   VLOG(1) << "GaiaCookieManagerService::StartFetchingLogOut";
-  gaia_auth_fetcher_.reset(signin_client_->CreateGaiaAuthFetcher(
+  gaia_auth_fetcher_ = signin_client_->CreateGaiaAuthFetcher(
       this, GetSourceForRequest(requests_.front()),
-      signin_client_->GetURLRequestContext()));
+      signin_client_->GetURLRequestContext());
   gaia_auth_fetcher_->StartLogOut();
 }
 
 void GaiaCookieManagerService::StartFetchingListAccounts() {
   VLOG(1) << "GaiaCookieManagerService::ListAccounts";
 
-  gaia_auth_fetcher_.reset(signin_client_->CreateGaiaAuthFetcher(
+  gaia_auth_fetcher_ = signin_client_->CreateGaiaAuthFetcher(
       this, GetSourceForRequest(requests_.front()),
-      signin_client_->GetURLRequestContext()));
+      signin_client_->GetURLRequestContext());
   gaia_auth_fetcher_->StartListAccounts();
 }
 
 void GaiaCookieManagerService::HandleNextRequest() {
   VLOG(1) << "GaiaCookieManagerService::HandleNextRequest";
   if (requests_.front().request_type() ==
       GaiaCookieRequestType::LIST_ACCOUNTS) {
     // This and any directly subsequent list accounts would return the same.
     while (!requests_.empty() && requests_.front().request_type() ==
            GaiaCookieRequestType::LIST_ACCOUNTS) {
@@ skipping 24 matching lines @@
         break;
       case GaiaCookieRequestType::LIST_ACCOUNTS:
         uber_token_fetcher_.reset();
         signin_client_->DelayNetworkCall(
             base::Bind(&GaiaCookieManagerService::StartFetchingListAccounts,
                        base::Unretained(this)));
         break;
     }
   }
 }