Revert 72380 - Remove wstring from autocomplete....

chrome/browser/autocomplete/autocomplete_popup_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_POPUP_VIEW_MAC_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_VIEW_MAC_H_
 #pragma once
 
 #import <Cocoa/Cocoa.h>
 
@@ skipping 84 matching lines @@
   // contents and description.  Result will be in |font|, with the
   // boldfaced version used for matches.
   static NSAttributedString* MatchText(const AutocompleteMatch& match,
                                 gfx::Font& font,
                                 float cellWidth);
 
   // Helper for MatchText() to allow sharing code between the contents
   // and description cases.  Returns NSMutableAttributedString as a
   // convenience for MatchText().
   static NSMutableAttributedString* DecorateMatchedString(
-      const string16 &matchString,
+      const std::wstring &matchString,
       const AutocompleteMatch::ACMatchClassifications &classifications,
       NSColor* textColor, NSColor* dimTextColor, gfx::Font& font);
 
   // Helper for MatchText() to elide a marked-up string using
   // gfx::ElideText() as a model.  Modifies |aString| in place.
   // TODO(shess): Consider breaking AutocompleteButtonCell out of this
   // code, and modifying it to have something like -setMatch:, so that
   // these convolutions to expose internals for testing can be
   // cleaner.
   static NSMutableAttributedString* ElideString(
       NSMutableAttributedString* aString,
-      const string16 originalString,
+      const std::wstring originalString,
       const gfx::Font& font,
       const float cellWidth);
 
  private:
   // Returns the AutocompleteMatrix for this popup view.
   AutocompleteMatrix* GetAutocompleteMatrix();
 
   // Create the popup_ instance if needed.
   void CreatePopupIfNeeded();
 
@@ skipping 17 matching lines @@
 
   // Child window containing a matrix which implements the popup.
   scoped_nsobject<NSWindow> popup_;
   scoped_nsobject<InstantOptInController> opt_in_controller_;
   NSRect targetPopupFrame_;
 
   DISALLOW_COPY_AND_ASSIGN(AutocompletePopupViewMac);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_VIEW_MAC_H_