Bring up of ui/text/elider on iOS.

ui/base/text/text_elider_unittest.cc

Index: ui/base/text/text_elider_unittest.cc
diff --git a/ui/base/text/text_elider_unittest.cc b/ui/base/text/text_elider_unittest.cc
index e290a6eaf0d756487867944f7cef327b6b982e32..c03395a59f3c8fd854cda2d79f59663daddbe5cc 100644
--- a/ui/base/text/text_elider_unittest.cc
+++ b/ui/base/text/text_elider_unittest.cc
@@ -55,7 +55,13 @@ void RunUrlTest(Testcase* testcases, size_t num_testcases) {
 
 }  // 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
@@ -247,7 +253,13 @@ TEST(TextEliderTest, TestFileURLEliding) {
   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]);