Refuse invalid SearchProvider and OSDD suggest URLs; etc.

chrome/browser/autocomplete/search_provider.h

 // Copyright (c) 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.
 //
 // This file contains the Search autocomplete provider.  This provider is
 // responsible for all non-keyword autocomplete entries that start with
 // "Search <engine> for ...", including searching for the current input string,
 // search history, and search suggestions.  An instance of it gets created and
 // managed by the autocomplete controller.
 
@@ skipping 221 matching lines @@
   void RemoveStaleResults();
   void RemoveStaleSuggestResults(SuggestResults* list, bool is_keyword);
   void RemoveStaleNavigationResults(NavigationResults* list, bool is_keyword);
 
   // Apply calculated relevance scores to the current results.
   void ApplyCalculatedRelevance();
   void ApplyCalculatedSuggestRelevance(SuggestResults* list, bool is_keyword);
   void ApplyCalculatedNavigationRelevance(NavigationResults* list,
                                           bool is_keyword);
 
-  // Creates a URLFetcher requesting suggest results from the specified
-  // |suggestions_url|. The caller owns the returned URLFetcher.
-  net::URLFetcher* CreateSuggestFetcher(
-      int id,
-      const TemplateURLRef& suggestions_url,
-      const string16& text);
+  // Starts a new URLFetcher requesting suggest results from |template_url|;
+  // callers own the returned URLFetcher, which is NULL for invalid providers.
+  net::URLFetcher* CreateSuggestFetcher(int id,
+                                        const TemplateURL* template_url,
+                                        const string16& text);
 
   // Parses results from the suggest server and updates the appropriate suggest
   // and navigation result lists, depending on whether |is_keyword| is true.
   // Returns whether the appropriate result list members were updated.
   bool ParseSuggestResults(base::Value* root_val, bool is_keyword);
 
   // Converts the parsed results to a set of AutocompleteMatches and adds them
   // to |matches_|.  This also sets |done_| correctly.
   void ConvertResultsToAutocompleteMatches();
 
@@ skipping 117 matching lines @@
   // Has FinalizeInstantQuery been invoked since the last |Start|?
   bool instant_finalized_;
 
   // The |suggest_text| parameter passed to FinalizeInstantQuery.
   string16 default_provider_suggest_text_;
 
   DISALLOW_COPY_AND_ASSIGN(SearchProvider);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_SEARCH_PROVIDER_H_