Remove wstring from autocomplete....

chrome/browser/autocomplete/autocomplete_edit_view_mac.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_EDIT_VIEW_MAC_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_EDIT_VIEW_MAC_H_
 #pragma once
 
 #import <Cocoa/Cocoa.h>
 
@@ skipping 28 matching lines @@
   virtual const AutocompleteEditModel* model() const { return model_.get(); }
 
   virtual void SaveStateToTab(TabContents* tab);
   virtual void Update(const TabContents* tab_for_state_restoring);
 
   virtual void OpenURL(const GURL& url,
                        WindowOpenDisposition disposition,
                        PageTransition::Type transition,
                        const GURL& alternate_nav_url,
                        size_t selected_line,
-                       const std::wstring& keyword);
+                       const string16& keyword);
 
-  virtual std::wstring GetText() const;
+  virtual string16 GetText() const;
 
   virtual bool IsEditingOrEmpty() const;
   virtual int GetIcon() const;
 
-  virtual void SetUserText(const std::wstring& text);
-  virtual void SetUserText(const std::wstring& text,
-                           const std::wstring& display_text,
+  virtual void SetUserText(const string16& text);
+  virtual void SetUserText(const string16& text,
+                           const string16& display_text,
                            bool update_popup);
 
-  virtual void SetWindowTextAndCaretPos(const std::wstring& text,
+  virtual void SetWindowTextAndCaretPos(const string16& text,
                                         size_t caret_pos);
 
   virtual void SetForcedQuery();
 
   virtual bool IsSelectAll();
   virtual bool DeleteAtEndPressed();
-  virtual void GetSelectionBounds(std::wstring::size_type* start,
-                                  std::wstring::size_type* end);
+  virtual void GetSelectionBounds(string16::size_type* start,
+                                  string16::size_type* end);
 
   virtual void SelectAll(bool reversed);
   virtual void RevertAll();
   virtual void UpdatePopup();
   virtual void ClosePopup();
   virtual void SetFocus();
-  virtual void OnTemporaryTextMaybeChanged(const std::wstring& display_text,
+  virtual void OnTemporaryTextMaybeChanged(const string16& display_text,
                                            bool save_original_selection);
   virtual bool OnInlineAutocompleteTextMaybeChanged(
-      const std::wstring& display_text, size_t user_text_length);
+      const string16& display_text, size_t user_text_length);
   virtual void OnStartingIME();
   virtual void OnRevertTemporaryText();
   virtual void OnBeforePossibleChange();
   virtual bool OnAfterPossibleChange();
   virtual gfx::NativeView GetNativeView() const;
   virtual CommandUpdater* GetCommandUpdater();
   virtual void SetInstantSuggestion(const string16& input);
   virtual int TextWidth() const;
   virtual bool IsImeComposing() const;
 
@@ skipping 14 matching lines @@
   virtual void OnSetFocus(bool control_down);
   virtual void OnKillFocus();
 
   bool CommitSuggestText();
 
   // Helper for LocationBarViewMac.  Optionally selects all in |field_|.
   void FocusLocation(bool select_all);
 
   // Helper to get appropriate contents from |clipboard|.  Returns
   // empty string if no appropriate data is found on |clipboard|.
-  static std::wstring GetClipboardText(ui::Clipboard* clipboard);
+  static string16 GetClipboardText(ui::Clipboard* clipboard);
 
   // Helper to get the font to use in the field, exposed for the
   // popup.
   static NSFont* GetFieldFont();
 
   // If |resource_id| has a PDF image which can be used, return it.
   // Otherwise return the PNG image from the resource bundle.
   static NSImage* ImageForResource(int resource_id);
 
  private:
@@ skipping 15 matching lines @@
   // in various DCHECKS to make sure code is running in appropriate
   // situations.
   bool IsFirstResponder() const;
 
   // If |model_| believes it has focus, grab focus if needed and set
   // the selection to |range|.  Otherwise does nothing.
   void SetSelectedRange(const NSRange range);
 
   // Update the field with |display_text| and highlight the host and scheme (if
   // it's an URL or URL-fragment).  Resets any suggest text that may be present.
-  void SetText(const std::wstring& display_text);
+  void SetText(const string16& display_text);
 
   // Internal implementation of SetText.  Does not reset the suggest text before
   // setting the display text.  Most callers should use |SetText()| instead.
-  void SetTextInternal(const std::wstring& display_text);
+  void SetTextInternal(const string16& display_text);
 
   // Update the field with |display_text| and set the selection.
-  void SetTextAndSelectedRange(const std::wstring& display_text,
+  void SetTextAndSelectedRange(const string16& display_text,
                                const NSRange range);
 
   // Returns the non-suggest portion of |field_|'s string value.
   NSString* GetNonSuggestTextSubstring() const;
 
   // Pass the current content of |field_| to SetText(), maintaining
   // any selection.  Named to be consistent with GTK and Windows,
   // though here we cannot really do the in-place operation they do.
   void EmphasizeURLComponents();
 
   // Calculates text attributes according to |display_text| and applies them
   // to the given |as| object.
-  void ApplyTextAttributes(const std::wstring& display_text,
+  void ApplyTextAttributes(const string16& display_text,
                            NSMutableAttributedString* as);
 
   scoped_ptr<AutocompleteEditModel> model_;
   scoped_ptr<AutocompletePopupViewMac> popup_view_;
 
   AutocompleteEditController* controller_;
   ToolbarModel* toolbar_model_;
 
   // The object that handles additional command functionality exposed on the
   // edit, such as invoking the keyword editor.
   CommandUpdater* command_updater_;
 
   AutocompleteTextField* field_;  // owned by tab controller
 
   // Selection at the point where the user started using the
   // arrows to move around in the popup.
   NSRange saved_temporary_selection_;
 
   // Tracking state before and after a possible change for reporting
   // to model_.
   NSRange selection_before_change_;
-  std::wstring text_before_change_;
+  string16 text_before_change_;
   NSRange marked_range_before_change_;
 
   // Length of the suggest text.  The suggest text always appears at the end of
   // the field.
   size_t suggest_text_length_;
 
   // Was delete pressed?
   bool delete_was_pressed_;
 
   // Was the delete key pressed with an empty selection at the end of the edit?
   bool delete_at_end_pressed_;
 
   // The maximum/standard line height for the displayed text.
   CGFloat line_height_;
 
   DISALLOW_COPY_AND_ASSIGN(AutocompleteEditViewMac);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_EDIT_VIEW_MAC_H_