Send URLs on non-zero prefix suggest requests also.

chrome/browser/autocomplete/zero_suggest_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 zero-suggest autocomplete provider. This experimental
 // provider is invoked when the user focuses in the omnibox prior to editing,
 // and generates search query suggestions based on the current URL. To enable
 // this provider, point --experimental-zero-suggest-url-prefix at an
 // appropriate suggestion service.
 //
@@ skipping 56 matching lines @@
   // Sets |field_trial_triggered_| to false.
   virtual void ResetSession() OVERRIDE;
 
   // net::URLFetcherDelegate
   virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
 
   // Initiates a new fetch for the given |url| of classification
   // |page_classification|. |permanent_text| is the omnibox text
   // for the current page.
   void StartZeroSuggest(
-      const GURL& url,
+      const GURL& curent_page_url,
       AutocompleteInput::PageClassification page_classification,
       const string16& permanent_text);
 
   bool field_trial_triggered_in_session() const {
     return field_trial_triggered_in_session_;
   }
 
  private:
   ZeroSuggestProvider(AutocompleteProviderListener* listener,
                       Profile* profile);
 
   virtual ~ZeroSuggestProvider();
 
-  bool ShouldRunZeroSuggest(
-      const GURL& url,
-      AutocompleteInput::PageClassification page_classification) const;
-
-  // Whether the URL can get Zero Suggest.  For example, don't send the URL of
-  // non-Google HTTPS requests because it may contain sensitive information.
-  bool ShouldSendURL(
-      const GURL& url,
-      AutocompleteInput::PageClassification page_classification) const;
-
   // The 4 functions below (that take classes defined in SearchProvider as
   // arguments) were copied and trimmed from SearchProvider.
   // TODO(hfung): Refactor them into a new base class common to both
   // ZeroSuggestProvider and SearchProvider.
 
   // From the OpenSearch formatted response |root_val|, populate query
   // suggestions into |suggest_results|, navigation suggestions into
   // |navigation_results|, and the verbatim relevance score into
   // |verbatim_relevance|.
   void FillResults(const base::Value& root_val,
@@ skipping 17 matching lines @@
                      AutocompleteMatch::Type type,
                      const TemplateURL* template_url,
                      const string16& query_string,
                      int accepted_suggestion,
                      SearchProvider::MatchMap* map);
 
   // Returns an AutocompleteMatch for a navigational suggestion |navigation|.
   AutocompleteMatch NavigationToMatch(
       const SearchProvider::NavigationResult& navigation);
 
-  // Fetches zero-suggest suggestions for |current_query_|.
-  void Run();
+  // Fetches zero-suggest suggestions by sending a request using |suggest_url|.
+  void Run(const GURL& suggest_url);
 
   // Parses results from the zero-suggest server and updates results.
   void ParseSuggestResults(const base::Value& root_val);
 
   // Converts the parsed results to a set of AutocompleteMatches and adds them
   // to |matches_|.  Also update the histograms for how many results were
   // received.
   void ConvertResultsToAutocompleteMatches();
 
   // Returns an AutocompleteMatch for the current URL. The match should be in
@@ skipping 46 matching lines @@
 
   history::MostVisitedURLList most_visited_urls_;
 
   // For callbacks that may be run after destruction.
   base::WeakPtrFactory<ZeroSuggestProvider> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ZeroSuggestProvider);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_ZERO_SUGGEST_PROVIDER_H_