Revert 104076 - Change std::wstring to string16 for views::Link

views/controls/label_unittest.cc

 // 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.
 
 #include "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/canvas.h"
@@ skipping 23 matching lines @@
   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;
-  string16 test_text(ASCIIToUTF16("A random string."));
+  std::wstring test_text(L"A random string.");
   label.SetText(test_text);
   EXPECT_EQ(test_text, label.GetText());
 }
 
 TEST(LabelTest, UrlProperty) {
   Label label;
   std::string my_url("http://www.orkut.com/some/Random/path");
   GURL url(my_url);
   label.SetURL(url);
   EXPECT_EQ(my_url, label.GetURL().spec());
-  EXPECT_EQ(UTF8ToUTF16(my_url), label.GetText());
+  EXPECT_EQ(UTF8ToWide(my_url), label.GetText());
 }
 
 TEST(LabelTest, ColorProperty) {
   Label label;
   SkColor color = SkColorSetARGB(20, 40, 10, 5);
   label.SetColor(color);
   EXPECT_EQ(color, label.GetColor());
 }
 
 TEST(LabelTest, AlignmentProperty) {
@@ skipping 38 matching lines @@
   EXPECT_FALSE(label.is_multi_line());
   label.SetMultiLine(true);
   EXPECT_TRUE(label.is_multi_line());
   label.SetMultiLine(false);
   EXPECT_FALSE(label.is_multi_line());
 }
 
 TEST(LabelTest, TooltipProperty) {
   Label label;
   string16 test_text(ASCIIToUTF16("My cool string."));
-  label.SetText(test_text);
+  label.SetText(UTF16ToWideHack(test_text));
 
   string16 tooltip;
   EXPECT_TRUE(label.GetTooltipText(gfx::Point(), &tooltip));
   EXPECT_EQ(test_text, tooltip);
 
   string16 tooltip_text(ASCIIToUTF16("The tooltip!"));
   label.SetTooltipText(tooltip_text);
   EXPECT_TRUE(label.GetTooltipText(gfx::Point(), &tooltip));
   EXPECT_EQ(tooltip_text, tooltip);
 
@@ skipping 26 matching lines @@
   label.SetTooltipText(tooltip_text);
   EXPECT_TRUE(label.GetTooltipText(gfx::Point(), &tooltip));
   EXPECT_EQ(tooltip_text, tooltip);
   // Clear out the tooltip.
   label.SetTooltipText(empty_text);
 }
 
 TEST(LabelTest, Accessibility) {
   Label label;
   string16 test_text(ASCIIToUTF16("My special text."));
-  label.SetText(test_text);
+  label.SetText(UTF16ToWideHack(test_text));
 
   ui::AccessibleViewState state;
   label.GetAccessibleState(&state);
   EXPECT_EQ(ui::AccessibilityTypes::ROLE_STATICTEXT, state.role);
   EXPECT_EQ(test_text, state.name);
   EXPECT_TRUE(ui::AccessibilityTypes::STATE_READONLY & state.state);
 }
 
 TEST(LabelTest, SingleLineSizing) {
   Label label;
-  string16 test_text(ASCIIToUTF16("A not so random string in one line."));
+  std::wstring test_text(L"A not so random string in one line.");
   label.SetText(test_text);
 
   // GetPreferredSize
   gfx::Size required_size = label.GetPreferredSize();
   EXPECT_GT(required_size.height(), kMinTextDimension);
   EXPECT_GT(required_size.width(), kMinTextDimension);
 
   // Test everything with borders.
   gfx::Insets border(10, 20, 30, 40);
   label.set_border(Border::CreateEmptyBorder(border.top(),
                                              border.left(),
                                              border.bottom(),
                                              border.right()));
 
   // GetPreferredSize and borders.
   label.SetBounds(0, 0, 0, 0);
   gfx::Size required_size_with_border = label.GetPreferredSize();
   EXPECT_EQ(required_size_with_border.height(),
             required_size.height() + border.height());
   EXPECT_EQ(required_size_with_border.width(),
             required_size.width() + border.width());
 }
 
 TEST(LabelTest, MultiLineSizing) {
   Label label;
   label.set_focusable(false);
-  string16 test_text(
-      ASCIIToUTF16("A random string\nwith multiple lines\nand returns!"));
+  std::wstring test_text(L"A random string\nwith multiple lines\nand returns!");
   label.SetText(test_text);
   label.SetMultiLine(true);
 
   // GetPreferredSize
   gfx::Size required_size = label.GetPreferredSize();
   EXPECT_GT(required_size.height(), kMinTextDimension);
   EXPECT_GT(required_size.width(), kMinTextDimension);
 
   // SizeToFit with unlimited width.
   label.SizeToFit(0);
@@ skipping 67 matching lines @@
 }
 
 TEST(LabelTest, DrawSingleLineString) {
   Label label;
   label.set_focusable(false);
 
   // Turn off mirroring so that we don't need to figure out if
   // align right really means align left.
   label.set_rtl_alignment_mode(Label::AUTO_DETECT_ALIGNMENT);
 
-  string16 test_text(ASCIIToUTF16("Here's a string with no returns."));
+  std::wstring test_text(L"Here's a string with no returns.");
   label.SetText(test_text);
   gfx::Size required_size(label.GetPreferredSize());
   gfx::Size extra(22, 8);
   label.SetBounds(0,
                   0,
                   required_size.width() + extra.width(),
                   required_size.height() + extra.height());
 
   // Do some basic verifications for all three alignments.
-  string16 paint_text;
+  std::wstring paint_text;
   gfx::Rect text_bounds;
   int flags;
 
   // Centered text.
   label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
   EXPECT_EQ(test_text, paint_text);
   // The text should be centered horizontally and vertically.
   EXPECT_EQ(extra.width() / 2, text_bounds.x());
   EXPECT_EQ(extra.height() / 2 , text_bounds.y());
   EXPECT_EQ(required_size.width(), text_bounds.width());
@@ skipping 87 matching lines @@
 // ellide multiline text. So until that can be resolved, we set all
 // multiline lables to not ellide in Linux only.
 TEST(LabelTest, DrawMultiLineString) {
   Label label;
   label.set_focusable(false);
 
   // Turn off mirroring so that we don't need to figure out if
   // align right really means align left.
   label.set_rtl_alignment_mode(Label::AUTO_DETECT_ALIGNMENT);
 
-  string16 test_text(ASCIIToUTF16("Another string\nwith returns\n\n!"));
+  std::wstring test_text(L"Another string\nwith returns\n\n!");
   label.SetText(test_text);
   label.SetMultiLine(true);
   label.SizeToFit(0);
   gfx::Size extra(50, 10);
   label.SetBounds(label.x(),
                   label.y(),
                   label.width() + extra.width(),
                   label.height() + extra.height());
 
   // Do some basic verifications for all three alignments.
-  string16 paint_text;
+  std::wstring paint_text;
   gfx::Rect text_bounds;
   int flags;
   label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
   EXPECT_EQ(test_text, paint_text);
   EXPECT_EQ(extra.width() / 2, text_bounds.x());
   EXPECT_EQ(extra.height() / 2, text_bounds.y());
   EXPECT_GT(text_bounds.width(), kMinTextDimension);
   EXPECT_GT(text_bounds.height(), kMinTextDimension);
   int expected_flags = gfx::Canvas::MULTI_LINE |
                        gfx::Canvas::TEXT_ALIGN_CENTER |
@@ skipping 108 matching lines @@
 #endif
 }
 
 TEST(LabelTest, DrawSingleLineStringInRTL) {
   Label label;
   label.set_focusable(false);
 
   std::string locale = l10n_util::GetApplicationLocale("");
   base::i18n::SetICUDefaultLocale("he");
 
-  string16 test_text(ASCIIToUTF16("Here's a string with no returns."));
+  std::wstring test_text(L"Here's a string with no returns.");
   label.SetText(test_text);
   gfx::Size required_size(label.GetPreferredSize());
   gfx::Size extra(22, 8);
   label.SetBounds(0,
                   0,
                   required_size.width() + extra.width(),
                   required_size.height() + extra.height());
 
   // Do some basic verifications for all three alignments.
-  string16 paint_text;
+  std::wstring paint_text;
   gfx::Rect text_bounds;
   int flags;
 
   // Centered text.
   label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
   EXPECT_EQ(test_text, paint_text);
   // The text should be centered horizontally and vertically.
   EXPECT_EQ(extra.width() / 2, text_bounds.x());
   EXPECT_EQ(extra.height() / 2 , text_bounds.y());
   EXPECT_EQ(required_size.width(), text_bounds.width());
@@ skipping 91 matching lines @@
 // ellide multiline text. So until that can be resolved, we set all
 // multiline lables to not ellide in Linux only.
 TEST(LabelTest, DrawMultiLineStringInRTL) {
   Label label;
   label.set_focusable(false);
 
   // Test for RTL.
   std::string locale = l10n_util::GetApplicationLocale("");
   base::i18n::SetICUDefaultLocale("he");
 
-  string16 test_text(ASCIIToUTF16("Another string\nwith returns\n\n!"));
+  std::wstring test_text(L"Another string\nwith returns\n\n!");
   label.SetText(test_text);
   label.SetMultiLine(true);
   label.SizeToFit(0);
   gfx::Size extra(50, 10);
   label.SetBounds(label.x(),
                   label.y(),
                   label.width() + extra.width(),
                   label.height() + extra.height());
 
   // Do some basic verifications for all three alignments.
-  string16 paint_text;
+  std::wstring paint_text;
   gfx::Rect text_bounds;
   int flags;
   label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
   EXPECT_EQ(test_text, paint_text);
   EXPECT_EQ(extra.width() / 2, text_bounds.x());
   EXPECT_EQ(extra.height() / 2, text_bounds.y());
   EXPECT_GT(text_bounds.width(), kMinTextDimension);
   EXPECT_GT(text_bounds.height(), kMinTextDimension);
 #if defined(OS_WIN)
   EXPECT_EQ(gfx::Canvas::MULTI_LINE | gfx::Canvas::TEXT_ALIGN_CENTER, flags);
@@ skipping 111 matching lines @@
       gfx::Canvas::TEXT_ALIGN_LEFT |
       gfx::Canvas::NO_ELLIPSIS,
       flags);
 #endif
 
   // Reset Locale
   base::i18n::SetICUDefaultLocale(locale);
 }
 
 }  // namespace views