Refuse invalid SearchProvider and OSDD suggest URLs; etc.

chrome/browser/autocomplete/search_provider.cc

Index: chrome/browser/autocomplete/search_provider.cc
diff --git a/chrome/browser/autocomplete/search_provider.cc b/chrome/browser/autocomplete/search_provider.cc
index c029620aa8c2a024281f72b4a7593a8e7ac25e8b..50f2681406bee1811ba34903b198d9767c6cf15f 100644
--- a/chrome/browser/autocomplete/search_provider.cc
+++ b/chrome/browser/autocomplete/search_provider.cc
@@ -312,20 +312,11 @@ void SearchProvider::Run() {
   DCHECK(!done_);
   suggest_results_pending_ = 0;
   time_suggest_request_sent_ = base::TimeTicks::Now();
-  const TemplateURL* default_url = providers_.GetDefaultProviderURL();
-  if (default_url && !default_url->suggestions_url().empty()) {
-    suggest_results_pending_++;
-    LogOmniboxSuggestRequest(REQUEST_SENT);
-    default_fetcher_.reset(CreateSuggestFetcher(kDefaultProviderURLFetcherID,
-        default_url->suggestions_url_ref(), input_.text()));
-  }
-  const TemplateURL* keyword_url = providers_.GetKeywordProviderURL();
-  if (keyword_url && !keyword_url->suggestions_url().empty()) {
-    suggest_results_pending_++;
-    LogOmniboxSuggestRequest(REQUEST_SENT);
-    keyword_fetcher_.reset(CreateSuggestFetcher(kKeywordProviderURLFetcherID,
-        keyword_url->suggestions_url_ref(), keyword_input_text_));
-  }
+
+  default_fetcher_.reset(CreateSuggestFetcher(kDefaultProviderURLFetcherID,
+      providers_.GetDefaultProviderURL(), input_.text()));
+  keyword_fetcher_.reset(CreateSuggestFetcher(kKeywordProviderURLFetcherID,
+      providers_.GetKeywordProviderURL(), keyword_input_text_));
 
   // Both the above can fail if the providers have been modified or deleted
   // since the query began.
@@ -641,13 +632,23 @@ void SearchProvider::ApplyCalculatedNavigationRelevance(NavigationResults* list,
 
 net::URLFetcher* SearchProvider::CreateSuggestFetcher(
     int id,
-    const TemplateURLRef& suggestions_url,
+    const TemplateURL* template_url,
     const string16& text) {
-  DCHECK(suggestions_url.SupportsReplacement());
-  net::URLFetcher* fetcher = net::URLFetcher::Create(id,
-      GURL(suggestions_url.ReplaceSearchTerms(
-          TemplateURLRef::SearchTermsArgs(text))),
-      net::URLFetcher::GET, this);
+  if (!template_url || template_url->suggestions_url().empty() ||
+      !template_url->suggestions_url_ref().IsValid())

[Peter Kasting, 2012/09/05 23:31:27]

You don't need to check IsValid(); if it fails, ReplaceSearchTerms() below will
return the empty string and you'll fail the next conditional.

[msw, 2012/09/06 20:02:29]

Done.

+    return NULL;
+
+  // Bail if the suggestion URL is invalid with the given replacements.
+  GURL suggest_url(template_url->suggestions_url_ref().ReplaceSearchTerms(
+                       TemplateURLRef::SearchTermsArgs(text)));

[Peter Kasting, 2012/09/05 23:31:27]

Nit: Indent 4 from beginning of line

[msw, 2012/09/06 20:02:29]

Done.

+  if (!suggest_url.is_valid())
+    return NULL;
+
+  suggest_results_pending_++;
+  LogOmniboxSuggestRequest(REQUEST_SENT);
+
+  net::URLFetcher* fetcher =
+      net::URLFetcher::Create(id, suggest_url, net::URLFetcher::GET, this);
   fetcher->SetRequestContext(profile_->GetRequestContext());
   fetcher->SetLoadFlags(net::LOAD_DO_NOT_SAVE_COOKIES);
   fetcher->Start();