Revert 71167 - Remove wstring from gfx....

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 "app/resource_bundle.h"
 #include "app/text_elider.h"
@@ skipping 431 matching lines @@
     popup_.reset(nil);
 
     return;
   }
 
   CreatePopupIfNeeded();
 
   // The popup's font is a slightly smaller version of the field's.
   NSFont* fieldFont = AutocompleteEditViewMac::GetFieldFont();
   const CGFloat resultFontSize = [fieldFont pointSize] + kEditFontAdjust;
-  gfx::Font resultFont(base::SysNSStringToUTF16([fieldFont fontName]),
+  gfx::Font resultFont(base::SysNSStringToWide([fieldFont fontName]),
                        static_cast<int>(resultFontSize));
 
   AutocompleteMatrix* matrix = GetAutocompleteMatrix();
 
   // Calculate the width of the matrix based on backing out the
   // popup's border from the width of the field.  Would prefer to use
   // [matrix convertSize:fromView:] for converting from screen size,
   // but that doesn't work until the popup is on-screen (bug?).
   const NSRect fieldRectBase = [field_ convertRect:[field_ bounds] toView:nil];
   const CGFloat popupWidth = NSWidth(fieldRectBase) - 2 * kWindowBorderWidth;
@@ skipping 364 matching lines @@
                        bottomRightCornerRadius:kPopupRoundingRadius];
 
   // Draw the matrix clipped to our border.
   [NSGraphicsContext saveGraphicsState];
   [path addClip];
   [super drawRect:rect];
   [NSGraphicsContext restoreGraphicsState];
 }
 
 @end