WIP - loop in LayoutManager for preferred size changes (2)

ui/views/controls/label_unittest.cc

Index: ui/views/controls/label_unittest.cc
diff --git a/ui/views/controls/label_unittest.cc b/ui/views/controls/label_unittest.cc
index c14bd6111faab5672196abafe9f9532e5011fcf6..b04d42454ae0ba623c72ca8a637df6a2ec832a73 100644
--- a/ui/views/controls/label_unittest.cc
+++ b/ui/views/controls/label_unittest.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/i18n/rtl.h"
+#include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/accessibility/accessible_view_state.h"
@@ -16,7 +17,16 @@ namespace views {
 // All text sizing measurements (width and height) should be greater than this.
 const int kMinTextDimension = 4;
 
-TEST(LabelTest, FontPropertyCourier) {
+class LabelTest : public testing::Test {

[Evan Stade, 2013/05/23 21:45:58]

some views_unittests will now need a message loop

+ public:
+  LabelTest() {}
+  virtual ~LabelTest() {}
+
+ private:
+  base::MessageLoopForUI loop_;
+};
+
+TEST_F(LabelTest, FontPropertyCourier) {
   Label label;
   std::string font_name("courier");
   // Note: This test is size dependent since Courier does not support all sizes.
@@ -30,7 +40,7 @@ TEST(LabelTest, FontPropertyCourier) {
   EXPECT_EQ(26, font_used.GetFontSize());
 }
 
-TEST(LabelTest, FontPropertyArial) {
+TEST_F(LabelTest, FontPropertyArial) {
   Label label;
   std::string font_name("arial");
   gfx::Font font(font_name, 30);
@@ -40,14 +50,14 @@ TEST(LabelTest, FontPropertyArial) {
   EXPECT_EQ(30, font_used.GetFontSize());
 }
 
-TEST(LabelTest, TextProperty) {
+TEST_F(LabelTest, TextProperty) {
   Label label;
   string16 test_text(ASCIIToUTF16("A random string."));
   label.SetText(test_text);
   EXPECT_EQ(test_text, label.text());
 }
 
-TEST(LabelTest, ColorProperty) {
+TEST_F(LabelTest, ColorProperty) {
   Label label;
   SkColor color = SkColorSetARGB(20, 40, 10, 5);
   label.SetAutoColorReadabilityEnabled(false);
@@ -55,7 +65,7 @@ TEST(LabelTest, ColorProperty) {
   EXPECT_EQ(color, label.enabled_color());
 }
 
-TEST(LabelTest, AlignmentProperty) {
+TEST_F(LabelTest, AlignmentProperty) {
   Label label;
   bool reverse_alignment = base::i18n::IsRTL();
 
@@ -79,7 +89,7 @@ TEST(LabelTest, AlignmentProperty) {
   EXPECT_EQ(gfx::ALIGN_CENTER, label.horizontal_alignment());
 }
 
-TEST(LabelTest, DirectionalityModeProperty) {
+TEST_F(LabelTest, DirectionalityModeProperty) {
   Label label;
   EXPECT_EQ(Label::USE_UI_DIRECTIONALITY, label.directionality_mode());
 
@@ -90,7 +100,7 @@ TEST(LabelTest, DirectionalityModeProperty) {
   EXPECT_EQ(Label::USE_UI_DIRECTIONALITY, label.directionality_mode());
 }
 
-TEST(LabelTest, MultiLineProperty) {
+TEST_F(LabelTest, MultiLineProperty) {
   Label label;
   EXPECT_FALSE(label.is_multi_line());
   label.SetMultiLine(true);
@@ -99,7 +109,7 @@ TEST(LabelTest, MultiLineProperty) {
   EXPECT_FALSE(label.is_multi_line());
 }
 
-TEST(LabelTest, TooltipProperty) {
+TEST_F(LabelTest, TooltipProperty) {
   Label label;
   string16 test_text(ASCIIToUTF16("My cool string."));
   label.SetText(test_text);
@@ -146,7 +156,7 @@ TEST(LabelTest, TooltipProperty) {
   label.SetTooltipText(empty_text);
 }
 
-TEST(LabelTest, Accessibility) {
+TEST_F(LabelTest, Accessibility) {
   Label label;
   string16 test_text(ASCIIToUTF16("My special text."));
   label.SetText(test_text);
@@ -158,7 +168,7 @@ TEST(LabelTest, Accessibility) {
   EXPECT_TRUE(ui::AccessibilityTypes::STATE_READONLY & state.state);
 }
 
-TEST(LabelTest, SingleLineSizing) {
+TEST_F(LabelTest, SingleLineSizing) {
   Label label;
   string16 test_text(ASCIIToUTF16("A not so random string in one line."));
   label.SetText(test_text);
@@ -184,7 +194,7 @@ TEST(LabelTest, SingleLineSizing) {
             required_size.width() + border.width());
 }
 
-TEST(LabelTest, MultilineSmallAvailableWidthSizing) {
+TEST_F(LabelTest, MultilineSmallAvailableWidthSizing) {
   Label label;
   string16 test_text(ASCIIToUTF16("Too Wide."));
 
@@ -202,7 +212,7 @@ TEST(LabelTest, MultilineSmallAvailableWidthSizing) {
   }
 }
 
-TEST(LabelTest, MultiLineSizing) {
+TEST_F(LabelTest, MultiLineSizing) {
   Label label;
   label.set_focusable(false);
   string16 test_text(
@@ -286,7 +296,7 @@ TEST(LabelTest, MultiLineSizing) {
             required_size.width() + border.width());
 }
 
-TEST(LabelTest, AutoDetectDirectionality) {
+TEST_F(LabelTest, AutoDetectDirectionality) {
   Label label;
   label.set_directionality_mode(Label::AUTO_DETECT_DIRECTIONALITY);
 
@@ -323,7 +333,7 @@ TEST(LabelTest, AutoDetectDirectionality) {
                      gfx::Canvas::FORCE_LTR_DIRECTIONALITY));
 }
 
-TEST(LabelTest, DrawSingleLineString) {
+TEST_F(LabelTest, DrawSingleLineString) {
   Label label;
   label.set_focusable(false);
 
@@ -459,7 +469,7 @@ TEST(LabelTest, DrawSingleLineString) {
 // On Linux the underlying pango routines require a max height in order to
 // ellide multiline text. So until that can be resolved, we set all
 // multiline lables to not ellide in Linux only.
-TEST(LabelTest, DrawMultiLineString) {
+TEST_F(LabelTest, DrawMultiLineString) {
   Label label;
   label.set_focusable(false);
 
@@ -600,7 +610,7 @@ TEST(LabelTest, DrawMultiLineString) {
 #endif
 }
 
-TEST(LabelTest, DrawSingleLineStringInRTL) {
+TEST_F(LabelTest, DrawSingleLineStringInRTL) {
   Label label;
   label.set_focusable(false);
 
@@ -739,7 +749,7 @@ TEST(LabelTest, DrawSingleLineStringInRTL) {
 // On Linux the underlying pango routines require a max height in order to
 // ellide multiline text. So until that can be resolved, we set all
 // multiline lables to not ellide in Linux only.
-TEST(LabelTest, DrawMultiLineStringInRTL) {
+TEST_F(LabelTest, DrawMultiLineStringInRTL) {
   Label label;
   label.set_focusable(false);
 
@@ -891,7 +901,7 @@ TEST(LabelTest, DrawMultiLineStringInRTL) {
 
 // Check that we disable subpixel rendering when a transparent background is
 // being used.
-TEST(LabelTest, DisableSubpixelRendering) {
+TEST_F(LabelTest, DisableSubpixelRendering) {
   Label label;
   label.SetBackgroundColor(SK_ColorWHITE);
   EXPECT_EQ(
@@ -904,7 +914,7 @@ TEST(LabelTest, DisableSubpixelRendering) {
 }
 
 // Check that labels support GetTooltipHandlerForPoint.
-TEST(LabelTest, GetTooltipHandlerForPoint) {
+TEST_F(LabelTest, GetTooltipHandlerForPoint) {
   Label label;
   label.SetText(
       ASCIIToUTF16("A string that's long enough to exceed the bounds"));