Chromium Code Reviews| Index: components/url_formatter/elide_url_unittest.cc |
| diff --git a/components/url_formatter/elide_url_unittest.cc b/components/url_formatter/elide_url_unittest.cc |
| index e8a92019f063fe528faf26ee4f30182ff2f0372f..ef85a99ceec480fc7cd239cc8ede7785a1830c58 100644 |
| --- a/components/url_formatter/elide_url_unittest.cc |
| +++ b/components/url_formatter/elide_url_unittest.cc |
| @@ -20,10 +20,6 @@ |
| #include "ui/gfx/text_utils.h" // nogncheck |
| #endif |
| -#if defined(OS_IOS) |
| -#include "base/ios/ios_util.h" |
| -#endif |
| - |
| namespace { |
| struct Testcase { |
| @@ -31,7 +27,6 @@ struct Testcase { |
| const std::string output; |
| enum SupportedPlatforms { |
| ALL = 0, |
| - NO_IOS9_OR_LATER, |
| NO_IOS, |
| } platforms; |
| }; |
| @@ -193,15 +188,14 @@ TEST(TextEliderTest, TestHostEliding) { |
| // TODO(rohitrao): Fix secure_display::ElideHost for iOS |
| // (crbug.com/517604). |
| {"http://subdomain.google.com", kEllipsisStr + ".google.com", |
| - Testcase::NO_IOS9_OR_LATER}, |
| + Testcase::NO_IOS}, |
| {"http://reallyreallyreallylongdomainname.com", |
| "reallyreallyreallylongdomainname.com"}, |
| - {"http://a.b.c.d.e.f.com", kEllipsisStr + "f.com", |
| - Testcase::NO_IOS9_OR_LATER}, |
| + {"http://a.b.c.d.e.f.com", kEllipsisStr + "f.com", Testcase::NO_IOS}, |
| {"http://foo", "foo"}, |
| {"http://foo.bar", "foo.bar"}, |
| {"http://subdomain.foo.bar", kEllipsisStr + "in.foo.bar", |
| - Testcase::NO_IOS9_OR_LATER}, |
| + Testcase::NO_IOS}, |
| {"http://subdomain.reallylongdomainname.com", |
| kEllipsisStr + "ain.reallylongdomainname.com", Testcase::NO_IOS}, |
| {"http://a.b.c.d.e.f.com", kEllipsisStr + ".e.f.com", Testcase::NO_IOS}, |
| @@ -212,9 +206,7 @@ TEST(TextEliderTest, TestHostEliding) { |
| for (size_t i = 0; i < arraysize(testcases); ++i) { |
| #if defined(OS_IOS) |
| - if (testcases[i].platforms == Testcase::NO_IOS || |
| - (testcases[i].platforms == Testcase::NO_IOS9_OR_LATER && |
| - base::ios::IsRunningOnIOS9OrLater())) { |
| + if (testcases[i].platforms == Testcase::NO_IOS) { |
|
Peter Kasting
2017/02/16 21:03:43
Nit: No {}
|
| continue; |
| } |
| #endif |