Remove IsRunningOnIOS9OrLater check from elide_url_unittest

components/url_formatter/elide_url_unittest.cc

 // Copyright 2014 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.
 
 #include "components/url_formatter/elide_url.h"
 
 #include <stddef.h>
 
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 #include "url/origin.h"
 
 #if !defined(OS_ANDROID)
 #include "ui/gfx/font_list.h"  // nogncheck
 #include "ui/gfx/text_elider.h"  // nogncheck
 #include "ui/gfx/text_utils.h"  // nogncheck
 #endif
 
-#if defined(OS_IOS)
-#include "base/ios/ios_util.h"
-#endif
-
 namespace {
 
 struct Testcase {
   const std::string input;
   const std::string output;
   enum SupportedPlatforms {
     ALL = 0,
-    NO_IOS9_OR_LATER,
     NO_IOS,
   } platforms;
 };
 
 #if !defined(OS_ANDROID)
 void RunUrlTest(Testcase* testcases, size_t num_testcases) {
   static const gfx::FontList font_list;
   for (size_t i = 0; i < num_testcases; ++i) {
     const GURL url(testcases[i].input);
     const float available_width =
@@ skipping 132 matching lines @@
     {"file://filer/foo/", "filer/foo/"},
     {"file://filer/foo/", "filer" + kEllipsisStr},
     // Eliding file URLs with nothing after the ':' shouldn't crash.
     {"file:///aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa:", "aaa" + kEllipsisStr},
     {"file:///aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa:/", "aaa" + kEllipsisStr},
   };
 
   RunUrlTest(testcases, arraysize(testcases));
 }
 
 TEST(TextEliderTest, TestHostEliding) {

[Peter Kasting, 2017/02/16 21:03:43]

It seems like this is the only test that uses NO_IOS, and it uses it on all but
the first case in its list.

I would look for a way to just remove the |platforms| member of Testcase.  The
easiest way would probably be to put "#if !defined(OS_IOS)" around all but the
first case in the list, and remove the member entirely, along with the #ifdefed
piece from the loop.

[pkl (ping after 24h if needed), 2017/02/22 14:47:57]

Yes, makes a lot of sense. Thank you!

   const std::string kEllipsisStr(gfx::kEllipsis);
   Testcase testcases[] = {
       {"http://google.com", "google.com"},
       // iOS width calculations are off by a letter from other platforms for
       // strings with too many kerned letters on the default font set.
       // 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},
       // IDN - Greek alpha.beta.gamma.delta.epsilon.zeta.com
       {"http://xn--mxa.xn--nxa.xn--oxa.xn--pxa.xn--qxa.xn--rxa.com",
        kEllipsisStr + ".\xCE\xB5.\xCE\xB6.com", Testcase::NO_IOS},
   };
 
   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
     const float available_width = gfx::GetStringWidthF(
         base::UTF8ToUTF16(testcases[i].output), gfx::FontList());
     EXPECT_EQ(base::UTF8ToUTF16(testcases[i].output),
               url_formatter::ElideHost(GURL(testcases[i].input),
                                        gfx::FontList(), available_width));
   }
 
@@ skipping 292 matching lines @@
   EXPECT_EQ(base::string16(), formatted_omit_scheme)
       << "Explicitly test the url::Origin which takes an empty, invalid URL";
 
   formatted_omit_scheme = url_formatter::FormatOriginForSecurityDisplay(
       url::Origin(GURL()), url_formatter::SchemeDisplay::OMIT_CRYPTOGRAPHIC);
   EXPECT_EQ(base::string16(), formatted_omit_scheme)
       << "Explicitly test the url::Origin which takes an empty, invalid URL";
 }
 
 }  // namespace