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..3d22125f7caa1b7dbff5f05c2d24918534246add 100644
--- a/ui/base/text/text_elider_unittest.cc
+++ b/ui/base/text/text_elider_unittest.cc
@@ -55,7 +55,14 @@ void RunUrlTest(Testcase* testcases, size_t num_testcases) {
 
 }  // namespace
 
-TEST(TextEliderTest, ElideEmail) {
+// TODO(ios): complex eliding is off by one for some of those tests on iOS.

[stuartmorgan, 2012/10/08 08:10:12]

s/complex/Complex/

[noyau (Ping after 24h), 2012/10/08 09:59:30]

Done.

+// See crbug.com/154019
+#if defined(OS_IOS)
+#define MAYBE_ElideEmail DISABLED_ElideEmail
+#else
+#define MAYBE_ElideEmail ElideEmail
+#endif
+TEST(TextEliderTest, MAYBE_ElideEmail) {
   const std::string kEllipsisStr(kEllipsis);
 
   // Test emails and their expected elided forms (from which the available
@@ -247,7 +254,14 @@ TEST(TextEliderTest, TestFileURLEliding) {
   RunUrlTest(testcases, arraysize(testcases));
 }
 
-TEST(TextEliderTest, TestFilenameEliding) {
+// TODO(ios): complex eliding is off by one for some of those tests on iOS.

[stuartmorgan, 2012/10/08 08:10:12]

Same.

[noyau (Ping after 24h), 2012/10/08 09:59:30]

Done.

+// See crbug.com/154019
+#if defined(OS_IOS)
+#define MAYBE_TestFilenameEliding DISABLED_TestFilenameEliding
+#else
+#define MAYBE_TestFilenameEliding TestFilenameEliding
+#endif
+TEST(TextEliderTest, MAYBE_TestFilenameEliding) {
   const std::string kEllipsisStr(kEllipsis);
   const FilePath::StringType kPathSeparator =
       FilePath::StringType().append(1, FilePath::kSeparators[0]);