Revert of retry r266042:

ui/views/controls/styled_label_unittest.cc

 // Copyright 2013 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 <string>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/font_list.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/styled_label.h"
 #include "ui/views/controls/styled_label_listener.h"
-#include "ui/views/test/views_test_base.h"
-#include "ui/views/widget/widget.h"
 
 using base::ASCIIToUTF16;
 
 namespace views {
 
-class StyledLabelTest : public ViewsTestBase, public StyledLabelListener {
+class StyledLabelTest : public testing::Test, public StyledLabelListener {
  public:
   StyledLabelTest() {}
   virtual ~StyledLabelTest() {}
 
   // StyledLabelListener implementation.
   virtual void StyledLabelLinkClicked(const gfx::Range& range,
                                       int event_flags) OVERRIDE {}
 
  protected:
   StyledLabel* styled() { return styled_.get(); }
@@ skipping 252 matching lines @@
   StyledLabel::RangeStyleInfo style_info_red;
   style_info_red.color = SK_ColorRED;
   styled()->AddStyleRange(gfx::Range(0, text_red.size()), style_info_red);
 
   StyledLabel::RangeStyleInfo style_info_link =
       StyledLabel::RangeStyleInfo::CreateForLink();
   styled()->AddStyleRange(gfx::Range(text_red.size(),
                                     text_red.size() + text_link.size()),
                           style_info_link);
 
+  // Obtain the default text color for a label.
+  Label label(ASCIIToUTF16(text));
+  const SkColor kDefaultTextColor = label.enabled_color();
+
+  // Obtain the default text color for a link;
+  Link link(ASCIIToUTF16(text_link));
+  const SkColor kDefaultLinkColor = link.enabled_color();
+
   styled()->SetBounds(0, 0, 1000, 1000);
   styled()->Layout();
 
-  Widget* widget = new Widget();
-  Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
-  widget->Init(params);
-  View* container = new View();
-  widget->SetContentsView(container);
-  container->AddChildView(styled());
-
-  // Obtain the default text color for a label.
-  Label* label = new Label(ASCIIToUTF16(text));
-  container->AddChildView(label);
-  const SkColor kDefaultTextColor = label->enabled_color();
-
-  // Obtain the default text color for a link;
-  Link* link = new Link(ASCIIToUTF16(text_link));
-  container->AddChildView(link);
-  const SkColor kDefaultLinkColor = link->enabled_color();
-
   EXPECT_EQ(SK_ColorRED,
             static_cast<Label*>(styled()->child_at(0))->enabled_color());
   EXPECT_EQ(kDefaultLinkColor,
             static_cast<Label*>(styled()->child_at(1))->enabled_color());
   EXPECT_EQ(kDefaultTextColor,
             static_cast<Label*>(styled()->child_at(2))->enabled_color());
+}
 
-  // Test adjusted color readability.
+TEST_F(StyledLabelTest, ColorReadability) {
+  const std::string text(
+      "This is a block of text that needs color adjustment.");
+  InitStyledLabel(text);
   styled()->SetDisplayedOnBackgroundColor(SK_ColorBLACK);
+
+  // Obtain the text color if it were a pure label.
+  Label label(ASCIIToUTF16(text));
+  label.SetBackgroundColor(SK_ColorBLACK);
+
+  styled()->SetBounds(0, 0, 1000, 1000);
   styled()->Layout();
-  label->SetBackgroundColor(SK_ColorBLACK);
 
-  const SkColor kAdjustedTextColor = label->enabled_color();
-  EXPECT_NE(kAdjustedTextColor, kDefaultTextColor);
-  EXPECT_EQ(kAdjustedTextColor,
-            static_cast<Label*>(styled()->child_at(2))->enabled_color());
-
-  widget->CloseNow();
+  EXPECT_EQ(label.enabled_color(),
+            static_cast<Label*>(styled()->child_at(0))->enabled_color());
 }
 
 TEST_F(StyledLabelTest, StyledRangeWithTooltip) {
   const std::string text("This is a test block of text, ");
   const std::string tooltip_text("this should have a tooltip,");
   const std::string normal_text(" this should not have a tooltip, ");
   const std::string link_text("and this should be a link");
 
   const size_t tooltip_start = text.size();
   const size_t link_start =
@@ skipping 60 matching lines @@
   EXPECT_EQ(label.GetPreferredSize().width(), styled()->width());
 }
 
 TEST_F(StyledLabelTest, HandleEmptyLayout) {
   const std::string text("This is a test block of text.");
   InitStyledLabel(text);
   styled()->Layout();
   EXPECT_EQ(0, styled()->child_count());
 }
 
-}  // namespace views
+}  // namespace