Revert 72380 - Remove wstring from autocomplete....

chrome/browser/autocomplete/keyword_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 keyword autocomplete provider. The keyword provider
 // is responsible for remembering/suggesting user "search keyword queries"
 // (e.g.  "imdb Godzilla") and then fixing them up into valid URLs.  An
 // instance of it gets created and managed by the autocomplete controller.
 // KeywordProvider uses a TemplateURLModel to find the set of keywords.
 //
@@ skipping 42 matching lines @@
  public:
   KeywordProvider(ACProviderListener* listener, Profile* profile);
   // For testing.
   KeywordProvider(ACProviderListener* listener, TemplateURLModel* model);
 
   // Returns the replacement string from the user input. The replacement
   // string is the portion of the input that does not contain the keyword.
   // For example, the replacement string for "b blah" is blah.
   // If |trim_leading_whitespace| is true then leading whitespace in
   // replacement string will be trimmed.
-  static string16 SplitReplacementStringFromInput(
-      const string16& input,
+  static std::wstring SplitReplacementStringFromInput(
+      const std::wstring& input,
       bool trim_leading_whitespace);
 
   // Returns the matching substituting keyword for |input|, or NULL if there
   // is no keyword for the specified input.
   static const TemplateURL* GetSubstitutingTemplateURLForInput(
       Profile* profile,
       const AutocompleteInput& input,
-      string16* remaining_input);
+      std::wstring* remaining_input);
 
   // AutocompleteProvider
   virtual void Start(const AutocompleteInput& input, bool minimal_changes);
   virtual void Stop();
 
  private:
   class ScopedEndExtensionKeywordMode;
   friend class ScopedEndExtensionKeywordMode;
 
   virtual ~KeywordProvider();
 
   // Extracts the keyword from |input| into |keyword|. Any remaining characters
   // after the keyword are placed in |remaining_input|. Returns true if |input|
   // is valid and has a keyword. This makes use of SplitKeywordFromInput to
   // extract the keyword and remaining string, and uses
   // TemplateURLModel::CleanUserInputKeyword to remove unnecessary characters.
   // In general use this instead of SplitKeywordFromInput.
   // Leading whitespace in |*remaining_input| will be trimmed.
   static bool ExtractKeywordFromInput(const AutocompleteInput& input,
-                                      string16* keyword,
-                                      string16* remaining_input);
+                                      std::wstring* keyword,
+                                      std::wstring* remaining_input);
 
   // Extracts the next whitespace-delimited token from input and returns it.
   // Sets |remaining_input| to everything after the first token (skipping over
   // the first intervening whitespace).
   // If |trim_leading_whitespace| is true then leading whitespace in
   // |*remaining_input| will be trimmed.
-  static string16 SplitKeywordFromInput(const string16& input,
-                                        bool trim_leading_whitespace,
-                                        string16* remaining_input);
+  static std::wstring SplitKeywordFromInput(const std::wstring& input,
+                                            bool trim_leading_whitespace,
+                                            std::wstring* remaining_input);
 
   // Fills in the "destination_url" and "contents" fields of |match| with the
   // provided user input and keyword data.
   static void FillInURLAndContents(
-      const string16& remaining_input,
+      const std::wstring& remaining_input,
       const TemplateURL* element,
       AutocompleteMatch* match);
 
   // Determines the relevance for some input, given its type, whether the user
   // typed the complete keyword, and whether the keyword needs query text (true
   // if the keyword supports replacement and the user isn't in "prefer keyword
   // matches" mode).
   // If |allow_exact_keyword_match| is false, the relevance for complete
   // keywords is degraded.
   static int CalculateRelevance(AutocompleteInput::Type type,
                                 bool complete,
                                 bool no_query_text_needed,
                                 bool allow_exact_keyword_match);
 
   // Creates a fully marked-up AutocompleteMatch from the user's input.
   // If |relevance| is negative, calculate a relevance based on heuristics.
   AutocompleteMatch CreateAutocompleteMatch(
       TemplateURLModel* model,
-      const string16& keyword,
+      const std::wstring& keyword,
       const AutocompleteInput& input,
       size_t prefix_length,
-      const string16& remaining_input,
+      const std::wstring& remaining_input,
       int relevance);
 
   void EnterExtensionKeywordMode(const std::string& extension_id);
   void MaybeEndExtensionKeywordMode();
 
   // NotificationObserver interface.
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
@@ skipping 17 matching lines @@
   // If non-empty, holds the ID of the extension whose keyword is currently in
   // the URL bar while the autocomplete popup is open.
   std::string current_keyword_extension_id_;
 
   NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(KeywordProvider);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_KEYWORD_PROVIDER_H_