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

components/omnibox/search_provider.cc

 // Copyright 2012 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/omnibox/search_provider.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/base64.h"
@@ skipping 537 matching lines @@
   }
 
   UpdateDone();
 }
 
 void SearchProvider::Run(bool query_is_private) {
   // Start a new request with the current input.
   time_suggest_request_sent_ = base::TimeTicks::Now();
 
   if (!query_is_private) {
-    default_fetcher_.reset(CreateSuggestFetcher(
-        kDefaultProviderURLFetcherID,
-        providers_.GetDefaultProviderURL(),
-        input_));
+    default_fetcher_ =
+        CreateSuggestFetcher(kDefaultProviderURLFetcherID,
+                             providers_.GetDefaultProviderURL(), input_);
   }
-  keyword_fetcher_.reset(CreateSuggestFetcher(
-      kKeywordProviderURLFetcherID,
-      providers_.GetKeywordProviderURL(),
-      keyword_input_));
+  keyword_fetcher_ =
+      CreateSuggestFetcher(kKeywordProviderURLFetcherID,
+                           providers_.GetKeywordProviderURL(), keyword_input_);
 
   // Both the above can fail if the providers have been modified or deleted
   // since the query began.
   if (!default_fetcher_ && !keyword_fetcher_) {
     UpdateDone();
     // We only need to update the listener if we're actually done.
     if (done_)
       listener_->OnProviderUpdate(false);
   } else {
     // Sent at least one request.
@@ skipping 238 matching lines @@
     SearchSuggestionParser::NavigationResults* list) {
   for (size_t i = 0; i < list->size(); ++i) {
     SearchSuggestionParser::NavigationResult& result = (*list)[i];
     result.set_relevance(
         result.CalculateRelevance(input_, providers_.has_keyword_provider()) +
         (list->size() - i - 1));
     result.set_relevance_from_server(false);
   }
 }
 
-net::URLFetcher* SearchProvider::CreateSuggestFetcher(
+scoped_ptr<net::URLFetcher> SearchProvider::CreateSuggestFetcher(
     int id,
     const TemplateURL* template_url,
     const AutocompleteInput& input) {
   if (!template_url || template_url->suggestions_url().empty())
     return NULL;
 
   // Bail if the suggestion URL is invalid with the given replacements.
   TemplateURLRef::SearchTermsArgs search_term_args(input.text());
   search_term_args.input_type = input.type();
   search_term_args.cursor_position = input.cursor_position();
@@ skipping 20 matching lines @@
       OmniboxFieldTrial::InZeroSuggestAfterTypingFieldTrial()) {
     search_term_args.current_page_url = current_page_url_.spec();
     // Create the suggest URL again with the current page URL.
     suggest_url = GURL(template_url->suggestions_url_ref().ReplaceSearchTerms(
         search_term_args,
         providers_.template_url_service()->search_terms_data()));
   }
 
   LogOmniboxSuggestRequest(REQUEST_SENT);
 
-  net::URLFetcher* fetcher =
+  scoped_ptr<net::URLFetcher> fetcher =
       net::URLFetcher::Create(id, suggest_url, net::URLFetcher::GET, this);
   fetcher->SetRequestContext(client_->RequestContext());
   fetcher->SetLoadFlags(net::LOAD_DO_NOT_SAVE_COOKIES);
   // Add Chrome experiment state to the request headers.
   net::HttpRequestHeaders headers;
   variations::VariationsHttpHeaderProvider::GetInstance()->AppendHeaders(
       fetcher->GetOriginalURL(), client_->IsOffTheRecord(), false, &headers);
   fetcher->SetExtraRequestHeaders(headers.ToString());
   fetcher->Start();
   return fetcher;
@@ skipping 637 matching lines @@
   for (MatchMap::const_iterator i(map.begin()); i != map.end(); ++i)
     matches.push_back(i->second);
   std::sort(matches.begin(), matches.end(), &AutocompleteMatch::MoreRelevant);
 
   // If there is a top scoring entry, find the corresponding answer.
   if (!matches.empty())
     return answers_cache_.GetTopAnswerEntry(matches[0].contents);
 
   return AnswersQueryData();
 }