Revert 71167 - Remove wstring from gfx....

chrome/browser/ui/cocoa/status_bubble_mac.mm

 // Copyright (c) 2009 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 "chrome/browser/ui/cocoa/status_bubble_mac.h"
 
 #include <limits>
 
 #include "app/text_elider.h"
 #include "base/compiler_specific.h"
@@ skipping 130 matching lines @@
 
   int text_width = static_cast<int>(NSWidth(frame) -
                                     kBubbleViewTextPositionX -
                                     kTextPadding);
 
   // Scale from view to window coordinates before eliding URL string.
   NSSize scaled_width = NSMakeSize(text_width, 0);
   scaled_width = [[parent_ contentView] convertSize:scaled_width fromView:nil];
   text_width = static_cast<int>(scaled_width.width);
   NSFont* font = [[window_ contentView] font];
-  gfx::Font font_chr(base::SysNSStringToUTF16([font fontName]),
+  gfx::Font font_chr(base::SysNSStringToWide([font fontName]),
                      [font pointSize]);
 
   string16 original_url_text = net::FormatUrl(url, UTF16ToUTF8(languages));
   string16 status = gfx::ElideUrl(url, font_chr, text_width,
       UTF16ToWideHack(languages));
 
   SetText(status, true);
 
   // In testing, don't use animation. When ExpandBubble is tested, it is
   // called explicitly.
@@ skipping 437 matching lines @@
 
 void StatusBubbleMac::ExpandBubble() {
   // Calculate the width available for expanded and standard bubbles.
   NSRect window_frame = CalculateWindowFrame(/*expand=*/true);
   CGFloat max_bubble_width = NSWidth(window_frame);
   CGFloat standard_bubble_width =
       NSWidth(CalculateWindowFrame(/*expand=*/false));
 
   // Generate the URL string that fits in the expanded bubble.
   NSFont* font = [[window_ contentView] font];
-  gfx::Font font_chr(base::SysNSStringToUTF16([font fontName]),
+  gfx::Font font_chr(base::SysNSStringToWide([font fontName]),
       [font pointSize]);
   string16 expanded_url = gfx::ElideUrl(url_, font_chr,
       max_bubble_width, UTF16ToWideHack(languages_));
 
   // Scale width from gfx::Font in view coordinates to window coordinates.
   int required_width_for_string =
       font_chr.GetStringWidth(expanded_url) +
           kTextPadding * 2 + kBubbleViewTextPositionX;
   NSSize scaled_width = NSMakeSize(required_width_for_string, 0);
   scaled_width = [[parent_ contentView] convertSize:scaled_width toView:nil];
@@ skipping 76 matching lines @@
 
   if (expanded_width) {
     size.width = screenRect.size.width;
   } else {
     size.width = kWindowWidthPercent * screenRect.size.width;
   }
 
   screenRect.size = size;
   return screenRect;
 }