Revert 72380 - Remove wstring from autocomplete....

chrome/browser/autocomplete/search_provider.h

 // Copyright (c) 2010 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 41 matching lines @@
   }
 #endif
 
   // Marks the instant query as done. If |input_text| is non-empty this changes
   // the 'search what you typed' results text to |input_text| + |suggest_text|.
   // |input_text| is the text the user input into the edit. |input_text| differs
   // from |input_.text()| if the input contained whitespace.
   //
   // This method also marks the search provider as no longer needing to wait for
   // the instant result.
-  void FinalizeInstantQuery(const string16& input_text,
-                            const string16& suggest_text);
+  void FinalizeInstantQuery(const std::wstring& input_text,
+                            const std::wstring& suggest_text);
 
   // AutocompleteProvider
   virtual void Start(const AutocompleteInput& input,
                      bool minimal_changes);
   virtual void Stop();
 
   // URLFetcher::Delegate
   virtual void OnURLFetchComplete(const URLFetcher* source,
                                   const GURL& url,
                                   const net::URLRequestStatus& status,
@@ skipping 71 matching lines @@
     // user changes their default while the query is running.
     TemplateURL cached_default_provider_;
     TemplateURL cached_keyword_provider_;
 
     // TODO(pkasting): http://b/1162970  We shouldn't need these.
     const TemplateURL* default_provider_;
     const TemplateURL* keyword_provider_;
   };
 
   struct NavigationResult {
-    NavigationResult(const GURL& url, const string16& site_name)
+    NavigationResult(const GURL& url, const std::wstring& site_name)
         : url(url),
           site_name(site_name) {
     }
 
     // The URL.
     GURL url;
 
     // Name for the site.
-    string16 site_name;
+    std::wstring site_name;
   };
 
-  typedef std::vector<string16> SuggestResults;
+  typedef std::vector<std::wstring> SuggestResults;
   typedef std::vector<NavigationResult> NavigationResults;
   typedef std::vector<history::KeywordSearchTermVisit> HistoryResults;
-  typedef std::map<string16, AutocompleteMatch> MatchMap;
+  typedef std::map<std::wstring, AutocompleteMatch> MatchMap;
 
   // Called when timer_ expires.
   void Run();
 
   // Runs the history query, if necessary. The history query is synchronous.
   // This does not update |done_|.
   void DoHistoryQuery(bool minimal_changes);
 
   // Determines whether an asynchronous subcomponent query should run for the
   // current input.  If so, starts it if necessary; otherwise stops it.
   // NOTE: This function does not update |done_|.  Callers must do so.
   void StartOrStopSuggestQuery(bool minimal_changes);
 
   // 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;
 
   // Stops the suggest query.
   // NOTE: This does not update |done_|.  Callers must do so.
   void StopSuggest();
 
   // Creates a URLFetcher requesting suggest results for the specified
   // TemplateURL. Ownership of the returned URLFetchet passes to the caller.
   URLFetcher* CreateSuggestFetcher(int id,
                                    const TemplateURL& provider,
-                                   const string16& text);
+                                   const std::wstring& text);
 
   // Parses the results from the Suggest server and stores up to kMaxMatches of
   // them in server_results_.  Returns whether parsing succeeded.
   bool ParseSuggestResults(Value* root_val,
                            bool is_keyword,
-                           const string16& input_text,
+                           const std::wstring& input_text,
                            SuggestResults* suggest_results);
 
   // Converts the parsed server results in server_results_ to a set of
   // AutocompleteMatches and adds them to |matches_|.  This also sets |done_|
   // correctly.
   void ConvertResultsToAutocompleteMatches();
 
   // Converts the first navigation result in |navigation_results| to an
   // AutocompleteMatch and adds it to |matches_|.
   void AddNavigationResultsToMatches(
@@ skipping 30 matching lines @@
                                       bool is_keyword) const;
   // |result_number| is same as above. |is_keyword| is true if the navigation
   // result was suggested by the keyword provider.
   int CalculateRelevanceForNavigation(size_t num_results,
                                       size_t result_number,
                                       bool is_keyword) const;
 
   // Creates an AutocompleteMatch for "Search <engine> for |query_string|" with
   // the supplied relevance.  Adds this match to |map|; if such a match already
   // exists, whichever one has lower relevance is eliminated.
-  void AddMatchToMap(const string16& query_string,
-                     const string16& input_text,
+  void AddMatchToMap(const std::wstring& query_string,
+                     const std::wstring& input_text,
                      int relevance,
                      AutocompleteMatch::Type type,
                      int accepted_suggestion,
                      bool is_keyword,
                      bool prevent_inline_autocomplete,
                      MatchMap* map);
 
   // Returns an AutocompleteMatch for a navigational suggestion.
   AutocompleteMatch NavigationToMatch(const NavigationResult& query_string,
                                       int relevance,
                                       bool is_keyword);
 
   // Updates the value of |done_| from the internal state.
   void UpdateDone();
 
   // Updates the description/description_class of the first search match.
   void UpdateFirstSearchMatchDescription();
 
   // Should we query for suggest results immediately? This is normally false,
   // but may be set to true during testing.
   static bool query_suggest_immediately_;
 
   // Maintains the TemplateURLs used.
   Providers providers_;
 
   // The user's input.
   AutocompleteInput input_;
 
   // Input text when searching against the keyword provider.
-  string16 keyword_input_text_;
+  std::wstring keyword_input_text_;
 
   // Searches in the user's history that begin with the input text.
   HistoryResults keyword_history_results_;
   HistoryResults default_history_results_;
 
   // Number of suggest results that haven't yet arrived. If greater than 0 it
   // indicates either |timer_| or one of the URLFetchers is still running.
   int suggest_results_pending_;
 
   // A timer to start a query to the suggest server after the user has stopped
@@ skipping 15 matching lines @@
   NavigationResults keyword_navigation_results_;
   NavigationResults default_navigation_results_;
 
   // Whether suggest_results_ is valid.
   bool have_suggest_results_;
 
   // Has FinalizeInstantQuery been invoked since the last |Start|?
   bool instant_finalized_;
 
   // The |suggest_text| parameter passed to FinalizeInstantQuery.
-  string16 default_provider_suggest_text_;
+  std::wstring default_provider_suggest_text_;
 
   DISALLOW_COPY_AND_ASSIGN(SearchProvider);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_SEARCH_PROVIDER_H_