Change SigninClient::CreateGaiaAuthFetcher return type to unique_ptr

google_apis/gaia/ubertoken_fetcher.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 "google_apis/gaia/ubertoken_fetcher.h"
 
 #include <vector>
 
 #include "base/logging.h"
+#include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/rand_util.h"
 #include "base/time/time.h"
 #include "google_apis/gaia/gaia_auth_fetcher.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 #include "google_apis/gaia/oauth2_token_service.h"
 
 namespace {
-GaiaAuthFetcher* CreateGaiaAuthFetcher(
+std::unique_ptr<GaiaAuthFetcher> CreateGaiaAuthFetcher(
     GaiaAuthConsumer* consumer,
     const std::string& source,
     net::URLRequestContextGetter* request_context) {
-  return new GaiaAuthFetcher(consumer, source, request_context);
+  return base::MakeUnique<GaiaAuthFetcher>(consumer, source, request_context);
 }
 }
 
 const int UbertokenFetcher::kMaxRetries = 3;
 
 UbertokenFetcher::UbertokenFetcher(
     OAuth2TokenService* token_service,
     UbertokenConsumer* consumer,
     const std::string& source,
     net::URLRequestContextGetter* request_context)
@@ skipping 108 matching lines @@
   gaia_auth_fetcher_.reset();
   retry_timer_.Stop();
 
   OAuth2TokenService::ScopeSet scopes;
   scopes.insert(GaiaConstants::kOAuth1LoginScope);
   access_token_request_ =
       token_service_->StartRequest(account_id_, scopes, this);
 }
 
 void UbertokenFetcher::ExchangeTokens() {
-  gaia_auth_fetcher_.reset(
-      gaia_auth_fetcher_factory_.Run(this, source_, request_context_));
+  gaia_auth_fetcher_ =
+      gaia_auth_fetcher_factory_.Run(this, source_, request_context_);
   gaia_auth_fetcher_->StartTokenFetchForUberAuthExchange(access_token_);
 }