Merge r1978 to Beta to stop sending queries with username info,...

chrome/browser/autocomplete/search_provider.h

 // Copyright 2008, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //    * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //    * Redistributions in binary form must reproduce the above
@@ skipping 111 matching lines @@
   typedef std::vector<NavigationResult> NavigationResults;
   typedef std::vector<history::KeywordSearchTermVisit> HistoryResults;
   typedef std::map<std::wstring, AutocompleteMatch> MatchMap;
 
   // Determines whether an asynchronous subcomponent query should run for the
   // current input.  If so, starts it if necessary; otherwise stops it.
   // NOTE: These functions do not update |done_|.  Callers must do so.
   void StartOrStopHistoryQuery(bool minimal_changes, bool synchronous_only);
   void StartOrStopSuggestQuery(bool minimal_changes, bool synchronous_only);
 
+  // Returns true when the current query can be sent to the Suggest service.
+  // This will be false e.g. when Suggest is disabled, the query contains
+  // potentially private data, etc.
+  bool IsQuerySuitableForSuggest() const;
+
   // Functions to stop the separate asynchronous subcomponents.
   // NOTE: These functions do not update |done_|.  Callers must do so.
   void StopHistory();
   void StopSuggest();
 
   // Called back by the history system to return searches that begin with the
   // input text.
   void OnGotMostRecentKeywordSearchTerms(
       CancelableRequestProvider::Handle handle,
       HistoryResults* results);
@@ skipping 93 matching lines @@
   // Navigational suggestions returned by the server.
   NavigationResults navigation_results_;
 
   // Whether suggest_results_ is valid.
   bool have_suggest_results_;
 
   DISALLOW_EVIL_CONSTRUCTORS(SearchProvider);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_SEARCH_PROVIDER_H__