Adjust URLFetcher::Create API so that object is returned as scoped_ptr.

google_apis/gaia/oauth2_access_token_fetcher_impl.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/oauth2_access_token_fetcher_impl.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 72 matching lines @@
   CHECK(!status.is_success());
   if (status.status() == URLRequestStatus::CANCELED) {
     return GoogleServiceAuthError(GoogleServiceAuthError::REQUEST_CANCELED);
   } else {
     DLOG(WARNING) << "Could not reach Google Accounts servers: errno "
                   << status.error();
     return GoogleServiceAuthError::FromConnectionError(status.error());
   }
 }
 
-static URLFetcher* CreateFetcher(URLRequestContextGetter* getter,
-                                 const GURL& url,
-                                 const std::string& body,
-                                 URLFetcherDelegate* delegate) {
+static scoped_ptr<URLFetcher> CreateFetcher(URLRequestContextGetter* getter,
+                                            const GURL& url,
+                                            const std::string& body,
+                                            URLFetcherDelegate* delegate) {
   bool empty_body = body.empty();
-  URLFetcher* result = net::URLFetcher::Create(
+  scoped_ptr<URLFetcher> result = net::URLFetcher::Create(
       0, url, empty_body ? URLFetcher::GET : URLFetcher::POST, delegate);
 
   result->SetRequestContext(getter);
   result->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES |
                        net::LOAD_DO_NOT_SAVE_COOKIES);
   // Fetchers are sometimes cancelled because a network change was detected,
   // especially at startup and after sign-in on ChromeOS. Retrying once should
   // be enough in those cases; let the fetcher retry up to 3 times just in case.
   // http://crbug.com/163710
   result->SetAutomaticallyRetryOnNetworkChanges(3);
@@ skipping 39 matching lines @@
     const std::vector<std::string>& scopes) {
   client_id_ = client_id;
   client_secret_ = client_secret;
   scopes_ = scopes;
   StartGetAccessToken();
 }
 
 void OAuth2AccessTokenFetcherImpl::StartGetAccessToken() {
   CHECK_EQ(INITIAL, state_);
   state_ = GET_ACCESS_TOKEN_STARTED;
-  fetcher_.reset(
-      CreateFetcher(getter_,
-                    MakeGetAccessTokenUrl(),
-                    MakeGetAccessTokenBody(
-                        client_id_, client_secret_, refresh_token_, scopes_),
-                    this));
+  fetcher_ = CreateFetcher(getter_, MakeGetAccessTokenUrl(),
+                           MakeGetAccessTokenBody(client_id_, client_secret_,
+                                                  refresh_token_, scopes_),
+                           this);
   fetcher_->Start();  // OnURLFetchComplete will be called.
 }
 
 void OAuth2AccessTokenFetcherImpl::EndGetAccessToken(
     const net::URLFetcher* source) {
   CHECK_EQ(GET_ACCESS_TOKEN_STARTED, state_);
   state_ = GET_ACCESS_TOKEN_DONE;
 
   URLRequestStatus status = source->GetStatus();
   int histogram_value =
@@ skipping 138 matching lines @@
 // static
 bool OAuth2AccessTokenFetcherImpl::ParseGetAccessTokenFailureResponse(
     const net::URLFetcher* source,
     std::string* error) {
   CHECK(error);
   scoped_ptr<base::DictionaryValue> value = ParseGetAccessTokenResponse(source);
   if (value.get() == NULL)
     return false;
   return value->GetString(kErrorKey, error);
 }