Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(157)

Unified Diff: components/omnibox/search_provider.cc

Issue 1117703002: Adjust URLFetcher::Create API so that object is returned as scoped_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove unneeded Pass() calls Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/omnibox/search_provider.cc
diff --git a/components/omnibox/search_provider.cc b/components/omnibox/search_provider.cc
index d0abdd7e0376119ed48aa6427a95e65b20c761aa..670debf1d3814e84a53f021148f752217a761492 100644
--- a/components/omnibox/search_provider.cc
+++ b/components/omnibox/search_provider.cc
@@ -555,15 +555,13 @@ void SearchProvider::Run(bool query_is_private) {
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.
@@ -822,7 +820,7 @@ void SearchProvider::ApplyCalculatedNavigationRelevance(
}
}
-net::URLFetcher* SearchProvider::CreateSuggestFetcher(
+scoped_ptr<net::URLFetcher> SearchProvider::CreateSuggestFetcher(
int id,
const TemplateURL* template_url,
const AutocompleteInput& input) {
@@ -863,7 +861,7 @@ net::URLFetcher* SearchProvider::CreateSuggestFetcher(
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);
« no previous file with comments | « components/omnibox/search_provider.h ('k') | components/password_manager/core/browser/affiliation_fetcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698