Revert 72380 - Remove wstring from autocomplete....

chrome/browser/autocomplete/autocomplete_popup_view_mac.mm

 // 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.
 
 #include <cmath>
 
 #include "chrome/browser/autocomplete/autocomplete_popup_view_mac.h"
 
 #include "base/stl_util-inl.h"
 #include "base/sys_string_conversions.h"
@@ skipping 84 matching lines @@
 }
 static NSColor* URLTextColor() {
   return [NSColor colorWithCalibratedRed:0.0 green:0.55 blue:0.0 alpha:1.0];
 }
 }  // namespace
 
 // Helper for MatchText() to allow sharing code between the contents
 // and description cases.  Returns NSMutableAttributedString as a
 // convenience for MatchText().
 NSMutableAttributedString* AutocompletePopupViewMac::DecorateMatchedString(
-    const string16 &matchString,
+    const std::wstring &matchString,
     const AutocompleteMatch::ACMatchClassifications &classifications,
     NSColor* textColor, NSColor* dimTextColor, gfx::Font& font) {
   // Cache for on-demand computation of the bold version of |font|.
   NSFont* boldFont = nil;
 
   // Start out with a string using the default style info.
-  NSString* s = base::SysUTF16ToNSString(matchString);
+  NSString* s = base::SysWideToNSString(matchString);
   NSDictionary* attributes = [NSDictionary dictionaryWithObjectsAndKeys:
                                   font.GetNativeFont(), NSFontAttributeName,
                                   textColor, NSForegroundColorAttributeName,
                                   nil];
   NSMutableAttributedString* as =
       [[[NSMutableAttributedString alloc] initWithString:s
                                               attributes:attributes]
         autorelease];
 
   // Mark up the runs which differ from the default.
@@ skipping 24 matching lines @@
                  value:dimTextColor
                  range:range];
     }
   }
 
   return as;
 }
 
 NSMutableAttributedString* AutocompletePopupViewMac::ElideString(
     NSMutableAttributedString* aString,
-    const string16 originalString,
+    const std::wstring originalString,
     const gfx::Font& font,
     const float width) {
   // If it already fits, nothing to be done.
   if ([aString size].width <= width) {
     return aString;
   }
 
   // If ElideText() decides to do nothing, nothing to be done.
-  const string16 elided = ui::ElideText(originalString, font, width, false);
+  const std::wstring elided(UTF16ToWideHack(ui::ElideText(
+      WideToUTF16Hack(originalString), font, width, false)));
   if (0 == elided.compare(originalString)) {
     return aString;
   }
 
   // If everything was elided away, clear the string.
   if (elided.size() == 0) {
     [aString deleteCharactersInRange:NSMakeRange(0, [aString length])];
     return aString;
   }
 
   // The ellipses should be the last character, and everything before
   // that should match the original string.
   const size_t i(elided.size() - 1);
   DCHECK(0 != elided.compare(0, i, originalString));
 
   // Replace the end of |aString| with the ellipses from |elided|.
-  NSString* s = base::SysUTF16ToNSString(elided.substr(i));
+  NSString* s = base::SysWideToNSString(elided.substr(i));
   [aString replaceCharactersInRange:NSMakeRange(i, [aString length] - i)
                          withString:s];
 
   return aString;
 }
 
 // Return the text to show for the match, based on the match's
 // contents and description.  Result will be in |font|, with the
 // boldfaced version used for matches.
 NSAttributedString* AutocompletePopupViewMac::MatchText(
@@ skipping 346 matching lines @@
     disposition =
         event_utils::WindowOpenDispositionFromNSEvent([NSApp currentEvent]);
   }
 
   // OpenURL() may close the popup, which will clear the result set
   // and, by extension, |match| and its contents.  So copy the
   // relevant strings out to make sure they stay alive until the call
   // completes.
   const AutocompleteMatch& match = model_->result().match_at(row);
   const GURL url(match.destination_url);
-  string16 keyword;
+  std::wstring keyword;
   const bool is_keyword_hint = model_->GetKeywordForMatch(match, &keyword);
   edit_view_->OpenURL(url, disposition, match.transition, GURL(), row,
-                      is_keyword_hint ? string16() : keyword);
+                      is_keyword_hint ? std::wstring() : keyword);
 }
 
 void AutocompletePopupViewMac::UserPressedOptIn(bool opt_in) {
   PromoCounter* counter = model_->profile()->GetInstantPromoCounter();
   DCHECK(counter);
   counter->Hide();
   if (opt_in) {
     browser::ShowInstantConfirmDialogIfNecessary([field_ window],
                                                  model_->profile());
   }
@@ skipping 262 matching lines @@
                        bottomRightCornerRadius:kPopupRoundingRadius];
 
   // Draw the matrix clipped to our border.
   [NSGraphicsContext saveGraphicsState];
   [path addClip];
   [super drawRect:rect];
   [NSGraphicsContext restoreGraphicsState];
 }
 
 @end