Revert 72380 - Remove wstring from autocomplete....

chrome/browser/autocomplete/autocomplete_popup_model.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.
 
 #ifndef CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_MODEL_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_MODEL_H_
 #pragma once
 
 #include "base/scoped_ptr.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
@@ skipping 12 matching lines @@
   AutocompletePopupModel(AutocompletePopupView* popup_view,
                          AutocompleteEditModel* edit_model,
                          Profile* profile);
   ~AutocompletePopupModel();
 
   // Invoked when the profile has changed.
   void SetProfile(Profile* profile);
 
   // 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);
 
   // Closes the window and cancels any pending asynchronous queries.
   void StopAutocomplete();
 
   // Returns true if the popup is currently open.
   bool IsOpen() const;
 
@@ skipping 46 matching lines @@
   // can move too.
   void InfoForCurrentSelection(AutocompleteMatch* match,
                                GURL* alternate_nav_url) const;
 
   // Gets the selected keyword or keyword hint for the given match.  Returns
   // true if |keyword| represents a keyword hint, or false if |keyword|
   // represents a selected keyword.  (|keyword| will always be set [though
   // 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
   // responsible for deleting the object.
   AutocompleteLog* GetAutocompleteLog();
 
   // Immediately updates and opens the popup if necessary, then moves the
   // current selection down (|count| > 0) or up (|count| < 0), clamping to the
   // first or last result if necessary.  If |count| == 0, the selection will be
   // unchanged, but the popup will still redraw and modify the text in the
@@ skipping 38 matching lines @@
   // which should only be true when the popup is closed.
   size_t selected_line_;
 
   // The match the user has manually chosen, if any.
   AutocompleteResult::Selection manually_selected_match_;
 
   DISALLOW_COPY_AND_ASSIGN(AutocompletePopupModel);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_MODEL_H_