Adjust URLFetcher::Create API so that object is returned as scoped_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 <queue>
 #include <vector>
 
 #include "base/json/json_reader.h"
@@ skipping 158 matching lines @@
 
   // Start a fetcher for each connection URL that needs to be checked.
   for (size_t i = 0; i < list->GetSize(); ++i) {
     const base::DictionaryValue* dict;
     if (list->GetDictionary(i, &dict)) {
       std::string token;
       std::string url;
       if (dict->GetString("carryBackToken", &token) &&
           dict->GetString("url", &url)) {
         results_[token] = "null";
-        net::URLFetcher* fetcher = CreateFetcher(GURL(url));
+        net::URLFetcher* fetcher = CreateFetcher(GURL(url)).release();
         fetchers_[fetcher->GetOriginalURL()] = std::make_pair(token, fetcher);
         fetcher->Start();
       }
     }
   }
 }
 
 void GaiaCookieManagerService::ExternalCcResultFetcher::
     OnGetCheckConnectionInfoError(const GoogleServiceAuthError& error) {
   if (++helper_->fetcher_retries_ < kMaxFetcherRetries &&
       IsTransientError(error)) {
     helper_->fetcher_backoff_.InformOfRequest(false);
     gaia_auth_fetcher_timer_.Start(
         FROM_HERE, helper_->fetcher_backoff_.GetTimeUntilRelease(),
         this, &GaiaCookieManagerService::ExternalCcResultFetcher::Start);
     return;
   }
 
   CleanupTransientState();
   GetCheckConnectionInfoCompleted(false);
 }
 
-net::URLFetcher*
+scoped_ptr<net::URLFetcher>
 GaiaCookieManagerService::ExternalCcResultFetcher::CreateFetcher(
     const GURL& url) {
-  net::URLFetcher* fetcher =
+  scoped_ptr<net::URLFetcher> fetcher =
       net::URLFetcher::Create(0, url, net::URLFetcher::GET, this);
   fetcher->SetRequestContext(helper_->request_context());
   fetcher->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.
   fetcher->SetAutomaticallyRetryOnNetworkChanges(1);
   return fetcher;
 }
@@ skipping 234 matching lines @@
   // be the last call in any other method.
   FOR_EACH_OBSERVER(Observer, observer_list_,
                     OnAddAccountToCookieCompleted(account_id, error));
 }
 
 void GaiaCookieManagerService::StartLogOutUrlFetch() {
   DCHECK(requests_.front().request_type() == GaiaCookieRequestType::LOG_OUT);
   VLOG(1) << "GaiaCookieManagerService::StartLogOutUrlFetch";
   GURL logout_url(GaiaUrls::GetInstance()->service_logout_url().Resolve(
       base::StringPrintf("?source=%s", source_.c_str())));
-  logout_url_request_.reset(
-      net::URLFetcher::Create(logout_url, net::URLFetcher::GET, this));
+  logout_url_request_ =
+      net::URLFetcher::Create(logout_url, net::URLFetcher::GET, this);
   logout_url_request_->SetRequestContext(
       signin_client_->GetURLRequestContext());
   logout_url_request_->Start();
 }
 
 void GaiaCookieManagerService::OnUbertokenSuccess(
     const std::string& uber_token) {
   DCHECK(requests_.front().request_type() ==
       GaiaCookieRequestType::ADD_ACCOUNT);
   VLOG(1) << "GaiaCookieManagerService::OnUbertokenSuccess"
@@ skipping 168 matching lines @@
       case GaiaCookieRequestType::LOG_OUT:
         StartLogOutUrlFetch();
         break;
       case GaiaCookieRequestType::LIST_ACCOUNTS:
         uber_token_fetcher_.reset();
         StartFetchingListAccounts();
         break;
     };
   }
 }