Fix infinite loop caused by ElideText()

ui/views/controls/label_unittest.cc

 // Copyright (c) 2012 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 166 matching lines @@
 
   // 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, MultilineSmallAvailableWidthSizing) {
+  Label label;
+  string16 test_text(ASCIIToUTF16("Too Wide."));
+
+  label.SetMultiLine(true);
+  label.SetAllowCharacterBreak(true);
+  label.SetElideBehavior(Label::ELIDE_AT_END);
+  label.SetText(test_text);
+
+  // Check that Label can be laid out at a variety of small sizes,
+  // splitting the words into up to one character per line if necessary.
+  // Incorrect word splitting may cause infinite loops in text layout.
+  gfx::Size required_size = label.GetPreferredSize();
+  for (int i = 1; i < required_size.width(); ++i) {
+    EXPECT_GT(label.GetHeightForWidth(i), 0);
+  }
+}
+
 TEST(LabelTest, MultiLineSizing) {
   Label label;
   label.set_focusable(false);
   string16 test_text(
       ASCIIToUTF16("A random string\nwith multiple lines\nand returns!"));
   label.SetText(test_text);
   label.SetMultiLine(true);
 
   // GetPreferredSize
   gfx::Size required_size = label.GetPreferredSize();
@@ skipping 674 matching lines @@
   EXPECT_FALSE(label.GetTooltipHandlerForPoint(gfx::Point(2, 51)));
   EXPECT_FALSE(label.GetTooltipHandlerForPoint(gfx::Point(-1, 20)));
 
   // GetTooltipHandlerForPoint works should work in child bounds.
   label.SetBounds(2, 2, 10, 10);
   EXPECT_EQ(&label, label.GetTooltipHandlerForPoint(gfx::Point(1, 5)));
   EXPECT_FALSE(label.GetTooltipHandlerForPoint(gfx::Point(3, 11)));
 }
 
 }  // namespace views