Bring up of ui/text/elider on iOS.

ui/base/text/text_elider_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.
 //
 // Unit tests for eliding and formatting utility functions.
 
 #include "ui/base/text/text_elider.h"
 
 #include "base/file_path.h"
 #include "base/i18n/rtl.h"
@@ skipping 37 matching lines @@
     // That's kinda redundant with net_util_unittests.
     EXPECT_EQ(UTF8ToUTF16(testcases[i].output),
               ElideUrl(url, font,
                        font.GetStringWidth(UTF8ToUTF16(testcases[i].output)),
                        std::string()));
   }
 }
 
 }  // namespace
 
+#if defined(OS_IOS)
+    // TODO(ios): complex eliding is off by one for some of those tests on iOS.

[stuartmorgan, 2012/10/06 11:47:04]

Don't indent.

+    // See crbug.com/154019
+TEST(TextEliderTest, DISABLED_ElideEmail) {

[stuartmorgan, 2012/10/06 11:47:04]

The standard Chromium practice is to use MAYBE_.  See
http://code.google.com/searchframe#OAMlx_jo-ck/src/net/base/cert_verify_proc_...
for an example.

+#else
 TEST(TextEliderTest, ElideEmail) {
+#endif  // defined(OS_IOS)

[stuartmorgan, 2012/10/06 11:47:04]

We generally omit the closing comment on ifdefs that are very short and we know
will stay that way, since in those cases they often hurt readability more than
they help.

   const std::string kEllipsisStr(kEllipsis);
 
   // Test emails and their expected elided forms (from which the available
   // widths will be derived).
   // For elided forms in which both the username and domain must be elided:
   // the result (how many characters are left on each side) can be font
   // dependent. To avoid this, the username is prefixed with the characters
   // expected to remain in the domain.
   Testcase testcases[] = {
       {"g@g.c", "g@g.c"},
@@ skipping 171 matching lines @@
      "C:/" + kEllipsisStr + "/filename"},
 #endif
     {"file://filer/foo/bar/file", "filer/foo/bar/file"},
     {"file://filer/foo/bar/file", "filer/foo/" + kEllipsisStr + "/file"},
     {"file://filer/foo/bar/file", "filer/" + kEllipsisStr + "/file"},
   };
 
   RunUrlTest(testcases, arraysize(testcases));
 }
 
+#if defined(OS_IOS)
+// TODO(ios): complex eliding is off by one for some of those tests on iOS.
+// See crbug.com/154019
+TEST(TextEliderTest, DISABLED_TestFilenameEliding) {
+#else
 TEST(TextEliderTest, TestFilenameEliding) {
+#endif  // defined(OS_IOS)
   const std::string kEllipsisStr(kEllipsis);
   const FilePath::StringType kPathSeparator =
       FilePath::StringType().append(1, FilePath::kSeparators[0]);
 
   FileTestcase testcases[] = {
     {FILE_PATH_LITERAL(""), ""},
     {FILE_PATH_LITERAL("."), "."},
     {FILE_PATH_LITERAL("filename.exe"), "filename.exe"},
     {FILE_PATH_LITERAL(".longext"), ".longext"},
     {FILE_PATH_LITERAL("pie"), "pie"},
@@ skipping 612 matching lines @@
 
   // Test adds ... at right spot when there is not enough room to break at a
   // word boundary.
   EXPECT_EQ(L"foooooey\x2026", UTF16ToWide(TruncateString(string, 11)));
 
   // Test completely truncates string if break is on initial whitespace.
   EXPECT_EQ(L"\x2026", UTF16ToWide(TruncateString(ASCIIToUTF16("   "), 2)));
 }
 
 }  // namespace ui