Revert 72380 - Remove wstring from autocomplete....

chrome/browser/ui/gtk/location_bar_view_gtk.h

 // Copyright (c) 2011 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_UI_GTK_LOCATION_BAR_VIEW_GTK_H_
 #define CHROME_BROWSER_UI_GTK_LOCATION_BAR_VIEW_GTK_H_
 #pragma once
 
 #include <gtk/gtk.h>
 
@@ skipping 77 matching lines @@
   void ShowStarBubble(const GURL& url, bool newly_boomkarked);
 
   // Set the starred state of the bookmark star.
   void SetStarred(bool starred);
 
   // Implement the AutocompleteEditController interface.
   virtual void OnAutocompleteWillClosePopup();
   virtual void OnAutocompleteLosingFocus(gfx::NativeView view_gaining_focus);
   virtual void OnAutocompleteWillAccept();
   // For this implementation, the parameter is ignored.
-  virtual bool OnCommitSuggestedText(const string16& typed_text);
+  virtual bool OnCommitSuggestedText(const std::wstring& typed_text);
   virtual bool AcceptCurrentInstantPreview();
   virtual void OnPopupBoundsChanged(const gfx::Rect& bounds);
   virtual void OnAutocompleteAccept(const GURL& url,
       WindowOpenDisposition disposition,
       PageTransition::Type transition,
       const GURL& alternate_nav_url);
   virtual void OnChanged();
   virtual void OnSelectionBoundsChanged();
   virtual void OnKillFocus();
   virtual void OnSetFocus();
   virtual void OnInputInProgress(bool in_progress);
   virtual SkBitmap GetFavIcon() const;
-  virtual string16 GetTitle() const;
+  virtual std::wstring GetTitle() const;
 
   // Implement the LocationBar interface.
   virtual void ShowFirstRunBubble(FirstRun::BubbleType bubble_type);
   virtual void SetSuggestedText(const string16& text);
   virtual std::wstring GetInputString() const;
   virtual WindowOpenDisposition GetWindowOpenDisposition() const;
   virtual PageTransition::Type GetPageTransition() const;
   virtual void AcceptInput();
   virtual void FocusLocation(bool select_all);
   virtual void FocusSearch();
@@ skipping 184 matching lines @@
 
   // Updates the maximum size of the EV certificate label.
   void UpdateEVCertificateLabelSize();
 
   // Sets the text that should be displayed in the info label and its associated
   // tooltip text.  Call with an empty string if the info label should be
   // hidden.
   void SetInfoText();
 
   // Set the keyword text for the Search BLAH: keyword box.
-  void SetKeywordLabel(const string16& keyword);
+  void SetKeywordLabel(const std::wstring& keyword);
 
   // Set the keyword text for the "Press tab to search BLAH" hint box.
-  void SetKeywordHintLabel(const string16& keyword);
+  void SetKeywordHintLabel(const std::wstring& keyword);
 
   void ShowFirstRunBubbleInternal(FirstRun::BubbleType bubble_type);
 
   // Show or hide |tab_to_search_box_| and |tab_to_search_hint_| according to
   // the value of |show_selected_keyword_|, |show_keyword_hint_|, and the
   // available horizontal space in the location bar.
   void AdjustChildrenVisibility();
 
   // Build the star icon.
   void CreateStarButton();
@@ skipping 86 matching lines @@
   // |tab_to_search_hint_|.
   int entry_box_width_;
 
   // Indicate if |tab_to_search_box_| should be shown.
   bool show_selected_keyword_;
 
   // Indicate if |tab_to_search_hint_| should be shown.
   bool show_keyword_hint_;
 
   // The last search keyword that was shown via the |tab_to_search_box_|.
-  string16 last_keyword_;
+  std::wstring last_keyword_;
 
   // True if we should update the instant controller when the edit text changes.
   bool update_instant_;
 
   DISALLOW_COPY_AND_ASSIGN(LocationBarViewGtk);
 };
 
 #endif  // CHROME_BROWSER_UI_GTK_LOCATION_BAR_VIEW_GTK_H_