Revert 72380 - Remove wstring from autocomplete....

chrome/browser/autocomplete/autocomplete_popup_model.h

Index: chrome/browser/autocomplete/autocomplete_popup_model.h
===================================================================
--- chrome/browser/autocomplete/autocomplete_popup_model.h	(revision 72382)
+++ chrome/browser/autocomplete/autocomplete_popup_model.h	(working copy)
@@ -30,8 +30,8 @@
 
   // Starts a new query running.  These parameters are passed through to the
   // autocomplete controller; see comments there.
-  void StartAutocomplete(const string16& text,
-                         const string16& desired_tld,
+  void StartAutocomplete(const std::wstring& text,
+                         const std::wstring& desired_tld,
                          bool prevent_inline_autocomplete,
                          bool prefer_keyword,
                          bool allow_exact_keyword_match);
@@ -98,11 +98,11 @@
   // possibly to the empty string], and you cannot have both a selected keyword
   // and a keyword hint simultaneously.)
   bool GetKeywordForMatch(const AutocompleteMatch& match,
-                          string16* keyword) const;
+                          std::wstring* keyword) const;
 
   // Calls through to SearchProvider::FinalizeInstantQuery.
-  void FinalizeInstantQuery(const string16& input_text,
-                            const string16& suggest_text);
+  void FinalizeInstantQuery(const std::wstring& input_text,
+                            const std::wstring& suggest_text);
 
   // Returns a pointer to a heap-allocated AutocompleteLog containing the
   // current input text, selected match, and result set.  The caller is