Remove wstring from gfx.

views/controls/label_unittest.cc

 // 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 "app/l10n_util.h"
 #include "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/canvas.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "views/border.h"
 #include "views/controls/label.h"
 
 namespace views {
 
 // All text sizing measurements (width and height) should be greater than this.
 const int kMinTextDimension = 4;
 
 #if defined(WIN_OS)

[evanm, 2011/01/11 21:56:47]

This define is totally wrong :<

[Avi (use Gerrit), 2011/01/11 22:15:28]

Oh wow. Let's trybot this again...

 // Courier is failing on linux because it's non scalable.
 TEST(LabelTest, FontPropertyCourier) {
   Label label;
-  std::wstring font_name(L"courier");
+  string16 font_name(ASCIIToUTF16("courier"));
   gfx::Font font = gfx::Font::CreateFont(font_name, 30);
   label.SetFont(font);
   gfx::Font font_used = label.font();
   EXPECT_EQ(font_name, font_used.FontName());
   EXPECT_EQ(30, font_used.FontSize());
 }
 #endif
 
 TEST(LabelTest, FontPropertyArial) {
   Label label;
-  std::wstring font_name(L"arial");
+  string16 font_name(ASCIIToUTF16("arial"));
   gfx::Font font(font_name, 30);
   label.SetFont(font);
   gfx::Font font_used = label.font();
   EXPECT_EQ(font_name, font_used.GetFontName());
   EXPECT_EQ(30, font_used.GetFontSize());
 }
 
 TEST(LabelTest, TextProperty) {
   Label label;
   std::wstring test_text(L"A random string.");
@@ skipping 763 matching lines @@
       gfx::Canvas::TEXT_ALIGN_LEFT |
       gfx::Canvas::NO_ELLIPSIS,
       flags);
 #endif
 
   // Reset Locale
   base::i18n::SetICUDefaultLocale(locale);
 }
 
 }  // namespace views