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)
+#if defined(OS_WIN)
 // 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 163 matching lines @@
   EXPECT_GT(required_size.width(), kMinTextDimension);
 
   // SizeToFit with unlimited width.
   label.SizeToFit(0);
   int required_width = label.GetLocalBounds(true).width();
   EXPECT_GT(required_width, kMinTextDimension);
 
   // SizeToFit with limited width.
   label.SizeToFit(required_width - 1);
   int constrained_width = label.GetLocalBounds(true).width();
-#if defined(WIN_OS)
+#if defined(OS_WIN)
   // Canvas::SizeStringInt (in app/gfx/canvas_linux.cc)
   // has to be fixed to return the size that fits to given width/height.
   EXPECT_LT(constrained_width, required_width);
 #endif
   EXPECT_GT(constrained_width, kMinTextDimension);
 
   // Change the width back to the desire width.
   label.SizeToFit(required_width);
   EXPECT_EQ(required_width, label.GetLocalBounds(true).width());
 
   // General tests for GetHeightForWidth.
   int required_height = label.GetHeightForWidth(required_width);
   EXPECT_GT(required_height, kMinTextDimension);
   int height_for_constrained_width = label.GetHeightForWidth(constrained_width);
-#if defined(WIN_OS)
+#if defined(OS_WIN)
   // Canvas::SizeStringInt (in app/gfx/canvas_linux.cc)
   // has to be fixed to return the size that fits to given width/height.
   EXPECT_GT(height_for_constrained_width, required_height);
 #endif
   // Using the constrained width or the required_width - 1 should give the
   // same result for the height because the constrainted width is the tight
   // width when given "required_width - 1" as the max width.
   EXPECT_EQ(height_for_constrained_width,
             label.GetHeightForWidth(required_width - 1));
 
@@ skipping 11 matching lines @@
 
   // GetHeightForWidth and borders.
   int required_height_with_border =
       label.GetHeightForWidth(required_width_with_border);
   EXPECT_EQ(required_height_with_border, required_height + border.height());
 
   // Test that the border width is subtracted before doing the height
   // calculation.  If it is, then the height will grow when width
   // is shrunk.
   int height1 = label.GetHeightForWidth(required_width_with_border - 1);
-#if defined(WIN_OS)
+#if defined(OS_WIN)
   // Canvas::SizeStringInt (in app/gfx/canvas_linux.cc)
   // has to be fixed to return the size that fits to given width/height.
   EXPECT_GT(height1, required_height_with_border);
 #endif
   EXPECT_EQ(height1, height_for_constrained_width + border.height());
 
   // GetPreferredSize and borders.
   label.SetBounds(0, 0, 0, 0);
   gfx::Size required_size_with_border = label.GetPreferredSize();
   EXPECT_EQ(required_size_with_border.height(),
@@ skipping 532 matching lines @@
       gfx::Canvas::TEXT_ALIGN_LEFT |
       gfx::Canvas::NO_ELLIPSIS,
       flags);
 #endif
 
   // Reset Locale
   base::i18n::SetICUDefaultLocale(locale);
 }
 
 }  // namespace views