Prepare to enable RenderTextHarfBuzz by default

ui/gfx/render_text_unittest.cc

Index: ui/gfx/render_text_unittest.cc
diff --git a/ui/gfx/render_text_unittest.cc b/ui/gfx/render_text_unittest.cc
index 3fc5aa3408abd1f9090e5103628d34c8f0ee4d2d..81e162fde06a63ad9fc6c3800ed6e2225eb7febf 100644
--- a/ui/gfx/render_text_unittest.cc
+++ b/ui/gfx/render_text_unittest.cc
@@ -824,6 +824,8 @@ TEST_F(RenderTextTest, MoveCursorLeftRight_ComplexScript) {
 }
 #endif
 
+// TODO(ckocagil): Fix the behavior and re-enable. http://crbug.com/383265
+#if 0

[msw, 2014/07/25 08:00:10]

Leave these tests running with CreateNativeInstance + TODOs.

[ckocagil, 2014/07/26 01:55:04]

Done.

 TEST_F(RenderTextTest, MoveCursorLeftRight_MeiryoUILigatures) {
   scoped_ptr<RenderText> render_text(RenderText::CreateInstance());
   // Meiryo UI uses single-glyph ligatures for 'ff' and 'ffi', but each letter
@@ -837,6 +839,7 @@ TEST_F(RenderTextTest, MoveCursorLeftRight_MeiryoUILigatures) {
   }
   EXPECT_EQ(6U, render_text->cursor_position());
 }
+#endif
 
 TEST_F(RenderTextTest, GraphemePositions) {
   // LTR 2-character grapheme, LTR abc, LTR 2-character grapheme.
@@ -1243,7 +1246,8 @@ TEST_F(RenderTextTest, MoveLeftRightByWordInChineseText) {
 }
 #endif
 
-#if defined(OS_WIN)
+// TODO(ckocagil): Remove when RenderTextWin goes away.
+#if 0
 TEST_F(RenderTextTest, Win_LogicalClusters) {
   scoped_ptr<RenderTextWin> render_text(
       static_cast<RenderTextWin*>(RenderText::CreateInstance()));
@@ -1257,7 +1261,7 @@ TEST_F(RenderTextTest, Win_LogicalClusters) {
   for (size_t i = 0; i < test_string.length(); ++i)
     EXPECT_EQ(i, logical_clusters[i]);
 }
-#endif  // defined(OS_WIN)
+#endif
 
 TEST_F(RenderTextTest, StringSizeSanity) {
   scoped_ptr<RenderText> render_text(RenderText::CreateInstance());
@@ -1574,6 +1578,8 @@ TEST_F(RenderTextTest, SetDisplayOffset) {
   }
 }
 
+// TODO(ckocagil): Fix the behavior and re-enable. http://crbug.com/396776
+#if 0
 TEST_F(RenderTextTest, SameFontForParentheses) {
   struct {
     const base::char16 left_char;
@@ -1648,6 +1654,7 @@ TEST_F(RenderTextTest, SameFontForParentheses) {
     }
   }
 }
+#endif
 
 // Make sure the caret width is always >=1 so that the correct
 // caret is drawn at high DPI. crbug.com/164100.
@@ -1870,7 +1877,8 @@ TEST_F(RenderTextTest, SelectionKeepsLigatures) {
   }
 }
 
-#if defined(OS_WIN)
+// TODO(ckocagil): Enable after implementing RenderTextHarfBuzz multiline mode.
+#if 0
 // Ensure strings wrap onto multiple lines for a small available width.
 TEST_F(RenderTextTest, Multiline_MinWidth) {
   const wchar_t* kTestStrings[] = { kWeak, kLtr, kLtrRtl, kLtrRtlLtr, kRtl,
@@ -1988,8 +1996,11 @@ TEST_F(RenderTextTest, Multiline_Newline) {
                 render_text->lines_[1].segments[0].char_range);
   }
 }
+#endif
 
-TEST_F(RenderTextTest, Win_BreakRunsByUnicodeBlocks) {
+// TODO(ckocagil): Remove when RenderTextWin goes away.

[msw, 2014/07/25 08:00:10]

Does RenderTextHarfBuzz not suffer from the http://crbug.com/278913 defect?

[ckocagil, 2014/07/26 01:55:04]

No, and there's a HarfBuzz version of this test, namely
HarfBuzz_BreakRunsByUnicodeBlocks.

+#if 0
+TEST_F(RenderTextTest, BreakRunsByUnicodeBlocks) {
   scoped_ptr<RenderTextWin> render_text(
       static_cast<RenderTextWin*>(RenderText::CreateInstance()));
 
@@ -2008,7 +2019,7 @@ TEST_F(RenderTextTest, Win_BreakRunsByUnicodeBlocks) {
   EXPECT_EQ(Range(2, 3), render_text->runs_[1]->range);
   EXPECT_EQ(Range(3, 5), render_text->runs_[2]->range);
 }
-#endif  // defined(OS_WIN)
+#endif
 
 TEST_F(RenderTextTest, HarfBuzz_CharToGlyph) {
   struct {