[iOS] Reenable flaky FontSizeJS test

I ran the test multiple times locally and wasn't able to reproduce the flakiness. However, the error is the same as that observed if you remove the viewport tag from |LoadHtml| and the same as the issue described in that comment. I tried adding in the -webkit-text-size-adjust flag in hopes that the two methods together will prevent flakiness. Fixed: 1038529 Change-Id: I742005ec22618566c6279d89fe9d1d7ca47c2867 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1983171Reviewed-by: Eugene But <eugenebut@chromium.org> Commit-Queue: Robbie Gibson <rkgibson@google.com> Cr-Commit-Position: refs/heads/master@{#728208}

[iOS] Reenable flaky FontSizeJS test
I ran the test multiple times locally and wasn't able to reproduce the flakiness. However, the error is the same as that observed if you remove the viewport tag from |LoadHtml| and the same as the issue described in that comment. I tried adding in the -webkit-text-size-adjust flag in hopes that the two methods together will prevent flakiness. Fixed: 1038529 Change-Id: I742005ec22618566c6279d89fe9d1d7ca47c2867 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1983171Reviewed-by: Eugene But <eugenebut@chromium.org> Commit-Queue: Robbie Gibson <rkgibson@google.com> Cr-Commit-Position: refs/heads/master@{#728208}
84305e34 · Robbie Gibson · Commit Bot · 9068d3f1 · 84305e34
Commit 84305e34 authored Jan 03, 2020 by Robbie Gibson Committed by Commit Bot Jan 03, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

ios/chrome/browser/web/font_size_js_unittest.mm ios/chrome/browser/web/font_size_js_unittest.mm +4 -3

No files found.
--- a/ios/chrome/browser/web/font_size_js_unittest.mm
+++ b/ios/chrome/browser/web/font_size_js_unittest.mm
@@ -40,7 +40,9 @@ class FontSizeJsTest : public web::WebJsTest<web::WebTestWithWebState> {
  // '-webkit-text-size-adjust=none' also works.
  void LoadHtml(NSString* html) {
    LoadHtmlAndInject(
-        [NSString stringWithFormat:@"<html><meta name='viewport' "
+        [NSString stringWithFormat:@"<html><style>"
+                                   @"html { -webkit-text-size-adjust=none }"
+                                   @"</style><meta name='viewport' "
                                   @"content='initial-scale=1.0'>%@</html>",
                                   html]);
  }
@@ -252,8 +254,7 @@ TEST_F(FontSizeJsTest, TestAdjustFontSizeForUnit) {
 }

 // Tests that __gCrWeb.accessibility.adjustFontSize works for nested elements.
-// TODO(crbug.com/1038529): Re-enable this test.
-TEST_F(FontSizeJsTest, FLAKY_TestAdjustFontSizeForNestedElements) {
+TEST_F(FontSizeJsTest, TestAdjustFontSizeForNestedElements) {
  // TODO(crbug.com/983776): This test fails on ipad since beta5 due to a
  // simulator bug. Re-enable this once the bug is fixed.
  if (base::ios::IsRunningOnIOS13OrLater() &&