Revert 72380 - Remove wstring from autocomplete....

chrome/browser/autocomplete/autocomplete_edit_view_views.h

Index: chrome/browser/autocomplete/autocomplete_edit_view_views.h
===================================================================
--- chrome/browser/autocomplete/autocomplete_edit_view_views.h	(revision 72382)
+++ chrome/browser/autocomplete/autocomplete_edit_view_views.h	(working copy)
@@ -81,32 +81,32 @@
                        PageTransition::Type transition,
                        const GURL& alternate_nav_url,
                        size_t selected_line,
-                       const string16& keyword);
+                       const std::wstring& keyword);
 
-  virtual string16 GetText() const;
+  virtual std::wstring GetText() const;
 
   virtual bool IsEditingOrEmpty() const;
   virtual int GetIcon() const;
-  virtual void SetUserText(const string16& text);
-  virtual void SetUserText(const string16& text,
-                           const string16& display_text,
+  virtual void SetUserText(const std::wstring& text);
+  virtual void SetUserText(const std::wstring& text,
+                           const std::wstring& display_text,
                            bool update_popup);
-  virtual void SetWindowTextAndCaretPos(const string16& text,
+  virtual void SetWindowTextAndCaretPos(const std::wstring& text,
                                         size_t caret_pos);
   virtual void SetForcedQuery();
   virtual bool IsSelectAll();
   virtual bool DeleteAtEndPressed();
-  virtual void GetSelectionBounds(string16::size_type* start,
-                                  string16::size_type* end);
+  virtual void GetSelectionBounds(std::wstring::size_type* start,
+                                  std::wstring::size_type* end);
   virtual void SelectAll(bool reversed);
   virtual void RevertAll();
   virtual void UpdatePopup();
   virtual void ClosePopup();
   virtual void SetFocus();
-  virtual void OnTemporaryTextMaybeChanged(const string16& display_text,
+  virtual void OnTemporaryTextMaybeChanged(const std::wstring& display_text,
                                            bool save_original_selection);
   virtual bool OnInlineAutocompleteTextMaybeChanged(
-      const string16& display_text, size_t user_text_length);
+      const std::wstring& display_text, size_t user_text_length);
   virtual void OnRevertTemporaryText();
   virtual void OnBeforePossibleChange();
   virtual bool OnAfterPossibleChange();
@@ -115,8 +115,8 @@
   virtual views::View* AddToView(views::View* parent);
   virtual int TextWidth() const;
   virtual bool IsImeComposing() const;
-  virtual bool CommitInstantSuggestion(const string16& typed_text,
-                                       const string16& suggested_text);
+  virtual bool CommitInstantSuggestion(const std::wstring& typed_text,
+                                       const std::wstring& suggested_text);
   virtual void SetInstantSuggestion(const string16& input);
 
   // Overridden from NotificationObserver:
@@ -141,7 +141,7 @@
   void TextChanged();
 
   // Update the field with |text| and set the selection.
-  void SetTextAndSelectedRange(const string16& text,
+  void SetTextAndSelectedRange(const std::wstring& text,
                                const views::TextRange& range);
 
   // Returns the selected text.
@@ -172,7 +172,7 @@
   views::TextRange saved_temporary_selection_;
 
   // Tracking state before and after a possible change.
-  string16 text_before_change_;
+  std::wstring text_before_change_;
   views::TextRange sel_before_change_;
 
   // TODO(oshima): following flags are copied from gtk implementation.