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

views/controls/label_unittest.cc

Index: views/controls/label_unittest.cc
diff --git a/views/controls/label_unittest.cc b/views/controls/label_unittest.cc
index 9a86fc8e16893d6d220b260eb9ce9f928efeb9a3..cbb769ae85274f875da2c215e8b2ee3b087a6bb6 100644
--- a/views/controls/label_unittest.cc
+++ b/views/controls/label_unittest.cc
@@ -20,7 +20,7 @@ const int kMinTextDimension = 4;
 // Courier is failing on linux because it's non scalable.
 TEST(LabelTest, FontPropertyCourier) {
   Label label;
-  string16 font_name(ASCIIToUTF16("courier"));
+  std::string font_name("courier");
   gfx::Font font(font_name, 30);
   label.SetFont(font);
   gfx::Font font_used = label.font();
@@ -31,7 +31,7 @@ TEST(LabelTest, FontPropertyCourier) {
 
 TEST(LabelTest, FontPropertyArial) {
   Label label;
-  string16 font_name(ASCIIToUTF16("arial"));
+  std::string font_name("arial");
   gfx::Font font(font_name, 30);
   label.SetFont(font);
   gfx::Font font_used = label.font();