Change string16 to std::string in the gfx::Font() interface.

ui/gfx/font.h

 // Copyright (c) 2011 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 UI_GFX_FONT_H_
 #define UI_GFX_FONT_H_
 #pragma once
 
 #include <string>
 
@@ skipping 25 matching lines @@
   Font(const Font& other);
   gfx::Font& operator=(const Font& other);
 
   // Creates a font from the specified native font.
   explicit Font(NativeFont native_font);
 
   // Construct a Font object with the specified PlatformFont object. The Font
   // object takes ownership of the PlatformFont object.
   explicit Font(PlatformFont* platform_font);
 
   // Creates a font with the specified name and size in pixels.

[Avi (use Gerrit), 2011/10/27 20:54:17]

Specify UTF-8 encoding for font names?

-  Font(const string16& font_name, int font_size);
+  Font(const std::string& font_name, int font_size);
 
   ~Font();
 
   // Returns a new Font derived from the existing font.
   // |size_deta| is the size in pixels to add to the current font. For example,
   // a value of 5 results in a font 5 pixels bigger than this font.
   Font DeriveFont(int size_delta) const;
 
   // Returns a new Font derived from the existing font.
   // |size_delta| is the size in pixels to add to the current font. See the
@@ skipping 21 matching lines @@
 
   // Returns the expected number of horizontal pixels needed to display the
   // specified length of characters. Call GetStringWidth() to retrieve the
   // actual number.
   int GetExpectedTextWidth(int length) const;
 
   // Returns the style of the font.
   int GetStyle() const;
 
   // Returns the font name.
-  string16 GetFontName() const;
+  std::string GetFontName() const;
 
   // Returns the font size in pixels.
   int GetFontSize() const;
 
   // Returns the native font handle.
   // Lifetime lore:
   // Windows: This handle is owned by the Font object, and should not be
   //          destroyed by the caller.
   // Mac:     The object is owned by the system and should not be released.
   // Gtk:     This handle is created on demand, and must be freed by calling
   //          pango_font_description_free() when the caller is done using it.
   NativeFont GetNativeFont() const;
 
   // Raw access to the underlying platform font implementation. Can be
   // static_cast to a known implementation type if needed.
   PlatformFont* platform_font() const { return platform_font_.get(); }
 
  private:
   // Wrapped platform font implementation.
   scoped_refptr<PlatformFont> platform_font_;
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_FONT_H_