[Refactor] Use correct viewport style in Android tests

third_party/WebKit/Source/web/tests/WebFrameTest.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 237 matching lines @@
         testing::WebTestDataPath(WebString::FromUTF8(file_name)), response);
   }
 
   void RegisterMockedHttpURLLoadWithMimeType(const std::string& file_name,
                                              const std::string& mime_type) {
     URLTestHelpers::RegisterMockedURLLoadFromBase(
         WebString::FromUTF8(base_url_), testing::WebTestDataPath(),
         WebString::FromUTF8(file_name), WebString::FromUTF8(mime_type));
   }
 
-  void ApplyViewportStyleOverride(
-      FrameTestHelpers::WebViewHelper* web_view_helper) {
-    web_view_helper->WebView()->GetSettings()->SetViewportStyle(
-        WebViewportStyle::kMobile);
-  }
-
   static void ConfigureCompositingWebView(WebSettings* settings) {
     settings->SetAcceleratedCompositingEnabled(true);
     settings->SetPreferCompositingToLCDTextEnabled(true);
   }
 
   static void ConfigureAndroid(WebSettings* settings) {
     settings->SetViewportMetaEnabled(true);
     settings->SetViewportEnabled(true);
     settings->SetMainFrameResizesAreOrientationChanges(true);
     settings->SetShrinksViewportContentToFit(true);
+    settings->SetViewportStyle(WebViewportStyle::kMobile);
   }
 
   static void ConfigureLoadsImagesAutomatically(WebSettings* settings) {
     settings->SetLoadsImagesAutomatically(true);
   }
 
   void InitializeTextSelectionWebView(
       const std::string& url,
       FrameTestHelpers::WebViewHelper* web_view_helper) {
     web_view_helper->InitializeAndLoad(url, true);
@@ skipping 798 matching lines @@
 class FixedLayoutTestWebViewClient
     : public FrameTestHelpers::TestWebViewClient {
  public:
   WebScreenInfo GetScreenInfo() override { return screen_info_; }
 
   WebScreenInfo screen_info_;
 };
 
 class FakeCompositingWebViewClient : public FixedLayoutTestWebViewClient {};
 
-// Viewport settings need to be set before the page gets loaded
-void EnableViewportSettings(WebSettings* settings) {
-  settings->SetViewportMetaEnabled(true);
-  settings->SetViewportEnabled(true);
-  settings->SetMainFrameResizesAreOrientationChanges(true);
-  settings->SetShrinksViewportContentToFit(true);
-}
-
 // Helper function to set autosizing multipliers on a document.
 bool SetTextAutosizingMultiplier(Document* document, float multiplier) {
   bool multiplier_set = false;
   for (LayoutItem layout_item = document->GetLayoutViewItem();
        !layout_item.IsNull(); layout_item = layout_item.NextInPreOrder()) {
     if (layout_item.Style()) {
       layout_item.MutableStyleRef().SetTextAutosizingMultiplier(multiplier);
 
       EXPECT_EQ(multiplier, layout_item.Style()->TextAutosizingMultiplier());
       multiplier_set = true;
@@ skipping 21 matching lines @@
        ChangeInFixedLayoutResetsTextAutosizingMultipliers) {
   RegisterMockedHttpURLLoad("fixed_layout.html");
 
   FixedLayoutTestWebViewClient client;
   int viewport_width = 640;
   int viewport_height = 480;
 
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.InitializeAndLoad(base_url_ + "fixed_layout.html", true,
                                     nullptr, &client, nullptr,
-                                    EnableViewportSettings);
+                                    ConfigureAndroid);
 
   Document* document =
       ToLocalFrame(web_view_helper.WebView()->GetPage()->MainFrame())
           ->GetDocument();
   document->GetSettings()->SetTextAutosizingEnabled(true);
   EXPECT_TRUE(document->GetSettings()->TextAutosizingEnabled());
   web_view_helper.Resize(WebSize(viewport_width, viewport_height));
 
   EXPECT_TRUE(SetTextAutosizingMultiplier(document, 2));
 
@@ skipping 35 matching lines @@
   RegisterMockedHttpURLLoad("iframe_reload.html");
   RegisterMockedHttpURLLoad("visible_iframe.html");
 
   FixedLayoutTestWebViewClient client;
   int viewport_width = 640;
   int viewport_height = 480;
 
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.InitializeAndLoad(base_url_ + "iframe_reload.html", true,
                                     nullptr, &client, nullptr,
-                                    EnableViewportSettings);
+                                    ConfigureAndroid);
 
   LocalFrame* main_frame =
       ToLocalFrame(web_view_helper.WebView()->GetPage()->MainFrame());
   Document* document = main_frame->GetDocument();
   LocalFrameView* frame_view =
       web_view_helper.WebView()->MainFrameImpl()->GetFrameView();
   document->GetSettings()->SetTextAutosizingEnabled(true);
   EXPECT_TRUE(document->GetSettings()->TextAutosizingEnabled());
   web_view_helper.Resize(WebSize(viewport_width, viewport_height));
 
@@ skipping 24 matching lines @@
   }
 }
 
 TEST_P(ParameterizedWebFrameTest, ZeroHeightPositiveWidthNotIgnored) {
   FixedLayoutTestWebViewClient client;
   client.screen_info_.device_scale_factor = 1;
   int viewport_width = 1280;
   int viewport_height = 0;
 
   FrameTestHelpers::WebViewHelper web_view_helper;
-  web_view_helper.Initialize(true, nullptr, &client, nullptr,
-                             EnableViewportSettings);
+  web_view_helper.Initialize(true, nullptr, &client, nullptr, ConfigureAndroid);
   web_view_helper.Resize(WebSize(viewport_width, viewport_height));
 
   EXPECT_EQ(viewport_width, web_view_helper.WebView()
                                 ->MainFrameImpl()
                                 ->GetFrameView()
                                 ->GetLayoutSize()
                                 .Width());
   EXPECT_EQ(viewport_height, web_view_helper.WebView()
                                  ->MainFrameImpl()
                                  ->GetFrameView()
                                  ->GetLayoutSize()
                                  .Height());
 }
 
 TEST_P(ParameterizedWebFrameTest,
        DeviceScaleFactorUsesDefaultWithoutViewportTag) {
   RegisterMockedHttpURLLoad("no_viewport_tag.html");
 
   int viewport_width = 640;
   int viewport_height = 480;
 
   FixedLayoutTestWebViewClient client;
   client.screen_info_.device_scale_factor = 2;
 
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.InitializeAndLoad(base_url_ + "no_viewport_tag.html", true,
                                     nullptr, &client, nullptr,
-                                    EnableViewportSettings);
+                                    ConfigureAndroid);
 
   web_view_helper.Resize(WebSize(viewport_width, viewport_height));
 
   EXPECT_EQ(
       2, web_view_helper.WebView()->GetPage()->DeviceScaleFactorDeprecated());
 
   // Device scale factor should be independent of page scale.
   web_view_helper.WebView()->SetDefaultPageScaleLimits(1, 2);
   web_view_helper.WebView()->SetPageScaleFactor(0.5);
   web_view_helper.WebView()->UpdateAllLifecyclePhases();
   EXPECT_EQ(1, web_view_helper.WebView()->PageScaleFactor());
 
   // Force the layout to happen before leaving the test.
   web_view_helper.WebView()->UpdateAllLifecyclePhases();
 }
 
 TEST_P(ParameterizedWebFrameTest, FixedLayoutInitializeAtMinimumScale) {
   RegisterMockedHttpURLLoad("fixed_layout.html");
 
   FixedLayoutTestWebViewClient client;
   client.screen_info_.device_scale_factor = 1;
   int viewport_width = 640;
   int viewport_height = 480;
 
   // Make sure we initialize to minimum scale, even if the window size
   // only becomes available after the load begins.
   FrameTestHelpers::WebViewHelper web_view_helper;
-  web_view_helper.Initialize(true, nullptr, &client, nullptr,
-                             EnableViewportSettings);
+  web_view_helper.Initialize(true, nullptr, &client, nullptr, ConfigureAndroid);
   web_view_helper.WebView()->SetDefaultPageScaleLimits(0.25f, 5);
   FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrame(),
                               base_url_ + "fixed_layout.html");
   web_view_helper.Resize(WebSize(viewport_width, viewport_height));
 
   int default_fixed_layout_width = 980;
   float minimum_page_scale_factor =
       viewport_width / (float)default_fixed_layout_width;
   EXPECT_EQ(minimum_page_scale_factor,
             web_view_helper.WebView()->PageScaleFactor());
@@ skipping 21 matching lines @@
   RegisterMockedHttpURLLoad("wide_document.html");
 
   FixedLayoutTestWebViewClient client;
   client.screen_info_.device_scale_factor = 1;
   int viewport_width = 640;
   int viewport_height = 480;
 
   // Make sure we initialize to minimum scale, even if the window size
   // only becomes available after the load begins.
   FrameTestHelpers::WebViewHelper web_view_helper;
-  web_view_helper.Initialize(true, nullptr, &client, nullptr,
-                             EnableViewportSettings);
+  web_view_helper.Initialize(true, nullptr, &client, nullptr, ConfigureAndroid);
   web_view_helper.WebView()->SetDefaultPageScaleLimits(0.25f, 5);
   FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrame(),
                               base_url_ + "wide_document.html");
   web_view_helper.Resize(WebSize(viewport_width, viewport_height));
 
   int wide_document_width = 1500;
   float minimum_page_scale_factor = viewport_width / (float)wide_document_width;
   EXPECT_EQ(minimum_page_scale_factor,
             web_view_helper.WebView()->PageScaleFactor());
   EXPECT_EQ(minimum_page_scale_factor,
@@ skipping 20 matching lines @@
   RegisterMockedHttpURLLoad("viewport-auto-initial-scale.html");
 
   FixedLayoutTestWebViewClient client;
   client.screen_info_.device_scale_factor = 1;
   int viewport_width = 640;
   int viewport_height = 480;
 
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.InitializeAndLoad(
       base_url_ + "viewport-auto-initial-scale.html", true, nullptr, &client,
-      nullptr, EnableViewportSettings);
+      nullptr, ConfigureAndroid);
   web_view_helper.Resize(WebSize(viewport_width, viewport_height));
 
   EXPECT_EQ(0.25f, web_view_helper.WebView()->PageScaleFactor());
 
   Document* document =
       ToLocalFrame(web_view_helper.WebView()->GetPage()->MainFrame())
           ->GetDocument();
   ViewportDescription description = document->GetViewportDescription();
   description.zoom = 2;
   document->SetViewportDescription(description);
   web_view_helper.WebView()->UpdateAllLifecyclePhases();
   EXPECT_EQ(2, web_view_helper.WebView()->PageScaleFactor());
 }
 
 TEST_P(ParameterizedWebFrameTest, setLoadWithOverviewModeToFalse) {
   RegisterMockedHttpURLLoad("viewport-auto-initial-scale.html");
 
   FixedLayoutTestWebViewClient client;
   client.screen_info_.device_scale_factor = 1;
   int viewport_width = 640;
   int viewport_height = 480;
 
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.InitializeAndLoad(
       base_url_ + "viewport-auto-initial-scale.html", true, nullptr, &client,
-      nullptr, EnableViewportSettings);
+      nullptr, ConfigureAndroid);
   web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);
   web_view_helper.WebView()->GetSettings()->SetLoadWithOverviewMode(false);
   web_view_helper.Resize(WebSize(viewport_width, viewport_height));
 
   // The page must be displayed at 100% zoom.
   EXPECT_EQ(1.0f, web_view_helper.WebView()->PageScaleFactor());
 }
 
 TEST_P(ParameterizedWebFrameTest,
        SetLoadWithOverviewModeToFalseAndNoWideViewport) {
   RegisterMockedHttpURLLoad("large-div.html");
 
   FixedLayoutTestWebViewClient client;
   client.screen_info_.device_scale_factor = 1;
   int viewport_width = 640;
   int viewport_height = 480;
 
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.InitializeAndLoad(base_url_ + "large-div.html", true, nullptr,
-                                    &client, nullptr, EnableViewportSettings);
+                                    &client, nullptr, ConfigureAndroid);
   web_view_helper.WebView()->GetSettings()->SetLoadWithOverviewMode(false);
   web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);
   web_view_helper.WebView()->GetSettings()->SetUseWideViewport(false);
   web_view_helper.Resize(WebSize(viewport_width, viewport_height));
 
   // The page must be displayed at 100% zoom, despite that it hosts a wide div
   // element.
   EXPECT_EQ(1.0f, web_view_helper.WebView()->PageScaleFactor());
 }
 
 TEST_P(ParameterizedWebFrameTest, NoWideViewportIgnoresPageViewportWidth) {
   RegisterMockedHttpURLLoad("viewport-auto-initial-scale.html");
 
   FixedLayoutTestWebViewClient client;
   client.screen_info_.device_scale_factor = 1;
   int viewport_width = 640;
   int viewport_height = 480;
 
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.InitializeAndLoad(
       base_url_ + "viewport-auto-initial-scale.html", true, nullptr, &client,
-      nullptr, EnableViewportSettings);
+      nullptr, ConfigureAndroid);
   web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);
   web_view_helper.WebView()->GetSettings()->SetUseWideViewport(false);
   web_view_helper.Resize(WebSize(viewport_width, viewport_height));
 
   // The page sets viewport width to 3000, but with UseWideViewport == false is
   // must be ignored.
   EXPECT_EQ(viewport_width, web_view_helper.WebView()
                                 ->MainFrameImpl()
                                 ->GetFrameView()
                                 ->ContentsSize()
@@ skipping 10 matching lines @@
   RegisterMockedHttpURLLoad("viewport-wide-2x-initial-scale.html");
 
   FixedLayoutTestWebViewClient client;
   client.screen_info_.device_scale_factor = 1;
   int viewport_width = 640;
   int viewport_height = 480;
 
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.InitializeAndLoad(
       base_url_ + "viewport-wide-2x-initial-scale.html", true, nullptr, &client,
-      nullptr, EnableViewportSettings);
+      nullptr, ConfigureAndroid);
   web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);
   web_view_helper.WebView()->GetSettings()->SetUseWideViewport(false);
   web_view_helper.Resize(WebSize(viewport_width, viewport_height));
 
   // The page sets viewport width to 3000, but with UseWideViewport == false it
   // must be ignored while the initial scale specified by the page must be
   // accounted.
   EXPECT_EQ(viewport_width / 2, web_view_helper.WebView()
                                     ->MainFrameImpl()
                                     ->GetFrameView()
@@ skipping 10 matching lines @@
   RegisterMockedHttpURLLoad("no_viewport_tag.html");
 
   FixedLayoutTestWebViewClient client;
   client.screen_info_.device_scale_factor = 1;
   int viewport_width = 640;
   int viewport_height = 480;
 
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.InitializeAndLoad(base_url_ + "no_viewport_tag.html", true,
                                     nullptr, &client, nullptr,
-                                    EnableViewportSettings);
-  ApplyViewportStyleOverride(&web_view_helper);
+                                    ConfigureAndroid);
   web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);
   web_view_helper.WebView()->GetSettings()->SetUseWideViewport(true);
   web_view_helper.Resize(WebSize(viewport_width, viewport_height));
 
   EXPECT_EQ(980, web_view_helper.WebView()
                      ->MainFrameImpl()
                      ->GetFrameView()
                      ->ContentsSize()
                      .Width());
   EXPECT_EQ(980.0 / viewport_width * viewport_height, web_view_helper.WebView()
                                                           ->MainFrameImpl()
                                                           ->GetFrameView()
                                                           ->ContentsSize()
                                                           .Height());
 }
 
 TEST_P(ParameterizedWebFrameTest, WideViewportSetsTo980WithXhtmlMp) {
   RegisterMockedHttpURLLoad("viewport/viewport-legacy-xhtmlmp.html");
 
   FixedLayoutTestWebViewClient client;
   client.screen_info_.device_scale_factor = 1;
   int viewport_width = 640;
   int viewport_height = 480;
 
   FrameTestHelpers::WebViewHelper web_view_helper;
-  web_view_helper.Initialize(true, nullptr, &client, nullptr,
-                             EnableViewportSettings);
-  ApplyViewportStyleOverride(&web_view_helper);
+  web_view_helper.Initialize(true, nullptr, &client, nullptr, ConfigureAndroid);
   web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);
   web_view_helper.WebView()->GetSettings()->SetUseWideViewport(true);
   FrameTestHelpers::LoadFrame(
       web_view_helper.WebView()->MainFrame(),
       base_url_ + "viewport/viewport-legacy-xhtmlmp.html");
 
   web_view_helper.Resize(WebSize(viewport_width, viewport_height));
   EXPECT_EQ(viewport_width, web_view_helper.WebView()
                                 ->MainFrameImpl()
                                 ->GetFrameView()
@@ skipping 10 matching lines @@
   RegisterMockedHttpURLLoad("viewport-height-1000.html");
 
   FixedLayoutTestWebViewClient client;
   client.screen_info_.device_scale_factor = 1;
   int viewport_width = 640;
   int viewport_height = 480;
 
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.InitializeAndLoad(base_url_ + "viewport-height-1000.html",
                                     true, nullptr, &client, nullptr,
-                                    EnableViewportSettings);
+                                    ConfigureAndroid);
   web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);
   web_view_helper.WebView()->GetSettings()->SetUseWideViewport(false);
   web_view_helper.Resize(WebSize(viewport_width, viewport_height));
 
   EXPECT_EQ(viewport_width, web_view_helper.WebView()
                                 ->MainFrameImpl()
                                 ->GetFrameView()
                                 ->ContentsSize()
                                 .Width());
 }
 
 TEST_P(ParameterizedWebFrameTest, WideViewportSetsTo980WithAutoWidth) {
   RegisterMockedHttpURLLoad("viewport-2x-initial-scale.html");
 
   FixedLayoutTestWebViewClient client;
   client.screen_info_.device_scale_factor = 1;
   int viewport_width = 640;
   int viewport_height = 480;
 
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.InitializeAndLoad(
       base_url_ + "viewport-2x-initial-scale.html", true, nullptr, &client,
-      nullptr, EnableViewportSettings);
-  ApplyViewportStyleOverride(&web_view_helper);
+      nullptr, ConfigureAndroid);
   web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);
   web_view_helper.WebView()->GetSettings()->SetUseWideViewport(true);
   web_view_helper.Resize(WebSize(viewport_width, viewport_height));
 
   EXPECT_EQ(980, web_view_helper.WebView()
                      ->MainFrameImpl()
                      ->GetFrameView()
                      ->ContentsSize()
                      .Width());
   EXPECT_EQ(980.0 / viewport_width * viewport_height, web_view_helper.WebView()
                                                           ->MainFrameImpl()
                                                           ->GetFrameView()
                                                           ->ContentsSize()
                                                           .Height());
 }
 
 TEST_P(ParameterizedWebFrameTest,
        PageViewportInitialScaleOverridesLoadWithOverviewMode) {
   RegisterMockedHttpURLLoad("viewport-wide-2x-initial-scale.html");
 
   FixedLayoutTestWebViewClient client;
   client.screen_info_.device_scale_factor = 1;
   int viewport_width = 640;
   int viewport_height = 480;
 
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.InitializeAndLoad(
       base_url_ + "viewport-wide-2x-initial-scale.html", true, nullptr, &client,
-      nullptr, EnableViewportSettings);
+      nullptr, ConfigureAndroid);
   web_view_helper.WebView()->GetSettings()->SetLoadWithOverviewMode(false);
   web_view_helper.Resize(WebSize(viewport_width, viewport_height));
 
   // The page must be displayed at 200% zoom, as specified in its viewport meta
   // tag.
   EXPECT_EQ(2.0f, web_view_helper.WebView()->PageScaleFactor());
 }
 
 TEST_P(ParameterizedWebFrameTest, setInitialPageScaleFactorPermanently) {
   RegisterMockedHttpURLLoad("fixed_layout.html");
 
   FixedLayoutTestWebViewClient client;
   client.screen_info_.device_scale_factor = 1;
   float enforced_page_scale_factor = 2.0f;
 
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.InitializeAndLoad(base_url_ + "fixed_layout.html", true,
                                     nullptr, &client, nullptr,
-                                    EnableViewportSettings);
-  ApplyViewportStyleOverride(&web_view_helper);
+                                    ConfigureAndroid);
   web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);
   web_view_helper.WebView()->GetSettings()->SetLoadWithOverviewMode(false);
   web_view_helper.WebView()->SetInitialPageScaleOverride(
       enforced_page_scale_factor);
   web_view_helper.WebView()->UpdateAllLifecyclePhases();
 
   EXPECT_EQ(enforced_page_scale_factor,
             web_view_helper.WebView()->PageScaleFactor());
 
   int viewport_width = 640;
@@ skipping 14 matching lines @@
 
   FixedLayoutTestWebViewClient client;
   client.screen_info_.device_scale_factor = 1;
   int viewport_width = 640;
   int viewport_height = 480;
   float enforced_page_scale_factor = 0.5f;
 
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.InitializeAndLoad(
       base_url_ + "viewport-auto-initial-scale.html", true, nullptr, &client,
-      nullptr, EnableViewportSettings);
+      nullptr, ConfigureAndroid);
   web_view_helper.WebView()->GetSettings()->SetLoadWithOverviewMode(false);
   web_view_helper.WebView()->SetInitialPageScaleOverride(
       enforced_page_scale_factor);
   web_view_helper.Resize(WebSize(viewport_width, viewport_height));
 
   EXPECT_EQ(enforced_page_scale_factor,
             web_view_helper.WebView()->PageScaleFactor());
 }
 
 TEST_P(ParameterizedWebFrameTest,
        PermanentInitialPageScaleFactorOverridesPageViewportInitialScale) {
   RegisterMockedHttpURLLoad("viewport-wide-2x-initial-scale.html");
 
   FixedLayoutTestWebViewClient client;
   client.screen_info_.device_scale_factor = 1;
   int viewport_width = 640;
   int viewport_height = 480;
   float enforced_page_scale_factor = 0.5f;
 
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.InitializeAndLoad(
       base_url_ + "viewport-wide-2x-initial-scale.html", true, nullptr, &client,
-      nullptr, EnableViewportSettings);
+      nullptr, ConfigureAndroid);
   web_view_helper.WebView()->SetInitialPageScaleOverride(
       enforced_page_scale_factor);
   web_view_helper.Resize(WebSize(viewport_width, viewport_height));
 
   EXPECT_EQ(enforced_page_scale_factor,
             web_view_helper.WebView()->PageScaleFactor());
 }
 
 TEST_P(ParameterizedWebFrameTest,
        SmallPermanentInitialPageScaleFactorIsClobbered) {
@@ skipping 12 matching lines @@
   FixedLayoutTestWebViewClient client;
   client.screen_info_.device_scale_factor = 1;
   int viewport_width = 400;
   int viewport_height = 300;
   float enforced_page_scale_factor = 0.75f;
 
   for (size_t i = 0; i < WTF_ARRAY_LENGTH(pages); ++i) {
     for (int quirk_enabled = 0; quirk_enabled <= 1; ++quirk_enabled) {
       FrameTestHelpers::WebViewHelper web_view_helper;
       web_view_helper.InitializeAndLoad(base_url_ + pages[i], true, nullptr,
-                                        &client, nullptr,
-                                        EnableViewportSettings);
-      ApplyViewportStyleOverride(&web_view_helper);
+                                        &client, nullptr, ConfigureAndroid);
       web_view_helper.WebView()
           ->GetSettings()
           ->SetClobberUserAgentInitialScaleQuirk(quirk_enabled);
       web_view_helper.WebView()->SetInitialPageScaleOverride(
           enforced_page_scale_factor);
       web_view_helper.Resize(WebSize(viewport_width, viewport_height));
 
       float expected_page_scale_factor =
           quirk_enabled && i < WTF_ARRAY_LENGTH(page_scale_factors)
               ? page_scale_factors[i]
               : enforced_page_scale_factor;
       EXPECT_EQ(expected_page_scale_factor,
                 web_view_helper.WebView()->PageScaleFactor());
     }
   }
 }
 
 TEST_P(ParameterizedWebFrameTest,
        PermanentInitialPageScaleFactorAffectsLayoutWidth) {
   FixedLayoutTestWebViewClient client;
   client.screen_info_.device_scale_factor = 1;
   int viewport_width = 640;
   int viewport_height = 480;
   float enforced_page_scale_factor = 0.5;
 
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.InitializeAndLoad("about:blank", true, nullptr, &client,
-                                    nullptr, EnableViewportSettings);
+                                    nullptr, ConfigureAndroid);
   web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);
   web_view_helper.WebView()->GetSettings()->SetUseWideViewport(false);
   web_view_helper.WebView()->GetSettings()->SetLoadWithOverviewMode(false);
   web_view_helper.WebView()->SetInitialPageScaleOverride(
       enforced_page_scale_factor);
   web_view_helper.Resize(WebSize(viewport_width, viewport_height));
 
   EXPECT_EQ(viewport_width / enforced_page_scale_factor,
             web_view_helper.WebView()
                 ->MainFrameImpl()
@@ skipping 109 matching lines @@
 
   FixedLayoutTestWebViewClient client;
   client.screen_info_.device_scale_factor = 1;
   int viewport_width = 640;
   int viewport_height = 480;
 
   FrameTestHelpers::WebViewHelper web_view_helper;
 
   web_view_helper.InitializeAndLoad(base_url_ + "200-by-300.html", true,
                                     nullptr, &client, nullptr,
-                                    EnableViewportSettings);
+                                    ConfigureAndroid);
   web_view_helper.Resize(WebSize(viewport_width, viewport_height));
 
   EXPECT_LE(viewport_height, web_view_helper.WebView()
                                  ->MainFrameImpl()
                                  ->GetFrameView()
                                  ->GetLayoutSize()
                                  .Height());
   web_view_helper.WebView()->GetSettings()->SetForceZeroLayoutHeight(true);
   EXPECT_TRUE(web_view_helper.WebView()
                   ->MainFrameImpl()
@@ skipping 190 matching lines @@
 
   FixedLayoutTestWebViewClient client;
   client.screen_info_.device_scale_factor = 1;
   int viewport_width = 640;
   int viewport_height = 480;
 
   FrameTestHelpers::WebViewHelper web_view_helper;
 
   web_view_helper.InitializeAndLoad(base_url_ + "200-by-300.html", true,
                                     nullptr, &client, nullptr,
-                                    EnableViewportSettings);
+                                    ConfigureAndroid);
   web_view_helper.WebView()->GetSettings()->SetForceZeroLayoutHeight(true);
   web_view_helper.Resize(WebSize(viewport_width, viewport_height));
 
   FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrame(),
                               base_url_ + "large-div.html");
   web_view_helper.WebView()->UpdateAllLifecyclePhases();
 
   EXPECT_EQ(0, web_view_helper.WebView()
                    ->MainFrameImpl()
                    ->GetFrameView()
                    ->GetLayoutSize()
                    .Height());
 }
 
 TEST_P(ParameterizedWebFrameTest,
        SetForceZeroLayoutHeightWithWideViewportQuirk) {
   RegisterMockedHttpURLLoad("200-by-300.html");
 
   FixedLayoutTestWebViewClient client;
   client.screen_info_.device_scale_factor = 1;
   int viewport_width = 640;
   int viewport_height = 480;
 
   FrameTestHelpers::WebViewHelper web_view_helper;
 
   web_view_helper.InitializeAndLoad(base_url_ + "200-by-300.html", true,
                                     nullptr, &client, nullptr,
-                                    EnableViewportSettings);
+                                    ConfigureAndroid);
   web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);
   web_view_helper.WebView()->GetSettings()->SetUseWideViewport(true);
   web_view_helper.WebView()->GetSettings()->SetForceZeroLayoutHeight(true);
   web_view_helper.Resize(WebSize(viewport_width, viewport_height));
 
   EXPECT_EQ(0, web_view_helper.WebView()
                    ->MainFrameImpl()
                    ->GetFrameView()
                    ->GetLayoutSize()
                    .Height());
 }
 
 TEST_P(ParameterizedWebFrameTest, WideViewportAndWideContentWithInitialScale) {
   RegisterMockedHttpURLLoad("wide_document_width_viewport.html");
   RegisterMockedHttpURLLoad("white-1x1.png");
 
   FixedLayoutTestWebViewClient client;
   client.screen_info_.device_scale_factor = 1;
   int viewport_width = 600;
   int viewport_height = 800;
 
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.InitializeAndLoad("about:blank", true, nullptr, &client,
-                                    nullptr, EnableViewportSettings);
+                                    nullptr, ConfigureAndroid);
   web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);
   web_view_helper.WebView()->GetSettings()->SetUseWideViewport(true);
   web_view_helper.WebView()->GetSettings()->SetViewportMetaLayoutSizeQuirk(
       true);
   web_view_helper.Resize(WebSize(viewport_width, viewport_height));
 
   FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrame(),
                               base_url_ + "wide_document_width_viewport.html");
   web_view_helper.Resize(WebSize(viewport_width, viewport_height));
 
   int wide_document_width = 800;
   float minimum_page_scale_factor = viewport_width / (float)wide_document_width;
   EXPECT_EQ(minimum_page_scale_factor,
             web_view_helper.WebView()->PageScaleFactor());
   EXPECT_EQ(minimum_page_scale_factor,
             web_view_helper.WebView()->MinimumPageScaleFactor());
 }
 
 TEST_P(ParameterizedWebFrameTest, WideViewportQuirkClobbersHeight) {
   RegisterMockedHttpURLLoad("viewport-height-1000.html");
 
   FixedLayoutTestWebViewClient client;
   client.screen_info_.device_scale_factor = 1;
   int viewport_width = 600;
   int viewport_height = 800;
 
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.InitializeAndLoad("about:blank", true, nullptr, &client,
-                                    nullptr, EnableViewportSettings);
+                                    nullptr, ConfigureAndroid);
   web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);
   web_view_helper.WebView()->GetSettings()->SetUseWideViewport(false);
   web_view_helper.WebView()->GetSettings()->SetViewportMetaLayoutSizeQuirk(
       true);
   web_view_helper.Resize(WebSize(viewport_width, viewport_height));
 
   FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrame(),
                               base_url_ + "viewport-height-1000.html");
   web_view_helper.Resize(WebSize(viewport_width, viewport_height));
 
   EXPECT_EQ(800, web_view_helper.WebView()
                      ->MainFrameImpl()
                      ->GetFrameView()
                      ->GetLayoutSize()
                      .Height());
   EXPECT_EQ(1, web_view_helper.WebView()->PageScaleFactor());
 }
 
 TEST_P(ParameterizedWebFrameTest, LayoutSize320Quirk) {
   RegisterMockedHttpURLLoad("viewport/viewport-30.html");
 
   FixedLayoutTestWebViewClient client;
   client.screen_info_.device_scale_factor = 1;
   int viewport_width = 600;
   int viewport_height = 800;
 
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.InitializeAndLoad("about:blank", true, nullptr, &client,
-                                    nullptr, EnableViewportSettings);
+                                    nullptr, ConfigureAndroid);
   web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);
   web_view_helper.WebView()->GetSettings()->SetUseWideViewport(true);
   web_view_helper.WebView()->GetSettings()->SetViewportMetaLayoutSizeQuirk(
       true);
   web_view_helper.Resize(WebSize(viewport_width, viewport_height));
 
   FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrame(),
                               base_url_ + "viewport/viewport-30.html");
   web_view_helper.Resize(WebSize(viewport_width, viewport_height));
 
@@ skipping 57 matching lines @@
 
 TEST_P(ParameterizedWebFrameTest, ZeroValuesQuirk) {
   RegisterMockedHttpURLLoad("viewport-zero-values.html");
 
   FixedLayoutTestWebViewClient client;
   client.screen_info_.device_scale_factor = 1;
   int viewport_width = 640;
   int viewport_height = 480;
 
   FrameTestHelpers::WebViewHelper web_view_helper;
-  web_view_helper.Initialize(true, nullptr, &client, nullptr,
-                             EnableViewportSettings);
+  web_view_helper.Initialize(true, nullptr, &client, nullptr, ConfigureAndroid);
   web_view_helper.WebView()->GetSettings()->SetViewportMetaZeroValuesQuirk(
       true);
   web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);
   web_view_helper.WebView()->GetSettings()->SetViewportMetaLayoutSizeQuirk(
       true);
   FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrame(),
                               base_url_ + "viewport-zero-values.html");
   web_view_helper.Resize(WebSize(viewport_width, viewport_height));
 
   EXPECT_EQ(viewport_width, web_view_helper.WebView()
@@ skipping 83 matching lines @@
 TEST_P(ParameterizedWebFrameTest, NonZeroValuesNoQuirk) {
   RegisterMockedHttpURLLoad("viewport-nonzero-values.html");
 
   FixedLayoutTestWebViewClient client;
   client.screen_info_.device_scale_factor = 1;
   int viewport_width = 640;
   int viewport_height = 480;
   float expected_page_scale_factor = 0.5f;
 
   FrameTestHelpers::WebViewHelper web_view_helper;
-  web_view_helper.Initialize(true, nullptr, &client, nullptr,
-                             EnableViewportSettings);
+  web_view_helper.Initialize(true, nullptr, &client, nullptr, ConfigureAndroid);
   web_view_helper.WebView()->GetSettings()->SetViewportMetaZeroValuesQuirk(
       true);
   web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);
   FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrame(),
                               base_url_ + "viewport-nonzero-values.html");
   web_view_helper.Resize(WebSize(viewport_width, viewport_height));
 
   EXPECT_EQ(viewport_width / expected_page_scale_factor,
             web_view_helper.WebView()
                 ->MainFrameImpl()
@@ skipping 20 matching lines @@
 
   FixedLayoutTestWebViewClient client;
   client.screen_info_.device_scale_factor = 1;
   // Small viewport to ensure there are always scrollbars.
   int viewport_width = 64;
   int viewport_height = 48;
 
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.InitializeAndLoad(base_url_ + "fixed_layout.html", true,
                                     nullptr, &client, nullptr,
-                                    EnableViewportSettings);
+                                    ConfigureAndroid);
   web_view_helper.Resize(WebSize(viewport_width, viewport_height));
 
   int prev_layout_count =
       web_view_helper.WebView()->MainFrameImpl()->GetFrameView()->LayoutCount();
   web_view_helper.WebView()->SetPageScaleFactor(3);
   EXPECT_FALSE(web_view_helper.WebView()
                    ->MainFrameImpl()
                    ->GetFrameView()
                    ->NeedsLayout());
   EXPECT_EQ(prev_layout_count, web_view_helper.WebView()
                                    ->MainFrameImpl()
                                    ->GetFrameView()
                                    ->LayoutCount());
 }
 
 TEST_P(ParameterizedWebFrameTest,
        setPageScaleFactorWithOverlayScrollbarsDoesNotLayout) {
   RegisterMockedHttpURLLoad("fixed_layout.html");
 
   FixedLayoutTestWebViewClient client;
   client.screen_info_.device_scale_factor = 1;
   int viewport_width = 640;
   int viewport_height = 480;
 
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.InitializeAndLoad(base_url_ + "fixed_layout.html", true,
                                     nullptr, &client, nullptr,
-                                    EnableViewportSettings);
+                                    ConfigureAndroid);
   web_view_helper.Resize(WebSize(viewport_width, viewport_height));
 
   int prev_layout_count =
       web_view_helper.WebView()->MainFrameImpl()->GetFrameView()->LayoutCount();
   web_view_helper.WebView()->SetPageScaleFactor(30);
   EXPECT_FALSE(web_view_helper.WebView()
                    ->MainFrameImpl()
                    ->GetFrameView()
                    ->NeedsLayout());
   EXPECT_EQ(prev_layout_count, web_view_helper.WebView()
                                    ->MainFrameImpl()
                                    ->GetFrameView()
                                    ->LayoutCount());
 }
 
 TEST_P(ParameterizedWebFrameTest, pageScaleFactorWrittenToHistoryItem) {
   RegisterMockedHttpURLLoad("fixed_layout.html");
 
   FixedLayoutTestWebViewClient client;
   client.screen_info_.device_scale_factor = 1;
   int viewport_width = 640;
   int viewport_height = 480;
 
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.InitializeAndLoad(base_url_ + "fixed_layout.html", true,
                                     nullptr, &client, nullptr,
-                                    EnableViewportSettings);
+                                    ConfigureAndroid);
   web_view_helper.Resize(WebSize(viewport_width, viewport_height));
 
   web_view_helper.WebView()->SetPageScaleFactor(3);
   EXPECT_EQ(3, ToLocalFrame(web_view_helper.WebView()->GetPage()->MainFrame())
                    ->Loader()
                    .GetDocumentLoader()
                    ->GetHistoryItem()
                    ->PageScaleFactor());
 }
 
 TEST_P(ParameterizedWebFrameTest, initialScaleWrittenToHistoryItem) {
   RegisterMockedHttpURLLoad("fixed_layout.html");
 
   FixedLayoutTestWebViewClient client;
   client.screen_info_.device_scale_factor = 1;
   int viewport_width = 640;
   int viewport_height = 480;
 
   FrameTestHelpers::WebViewHelper web_view_helper;
-  web_view_helper.Initialize(true, nullptr, &client, nullptr,
-                             EnableViewportSettings);
+  web_view_helper.Initialize(true, nullptr, &client, nullptr, ConfigureAndroid);
   web_view_helper.WebView()->SetDefaultPageScaleLimits(0.25f, 5);
   FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrame(),
                               base_url_ + "fixed_layout.html");
   web_view_helper.Resize(WebSize(viewport_width, viewport_height));
 
   int default_fixed_layout_width = 980;
   float minimum_page_scale_factor =
       viewport_width / (float)default_fixed_layout_width;
   EXPECT_EQ(minimum_page_scale_factor,
             ToLocalFrame(web_view_helper.WebView()->GetPage()->MainFrame())
                 ->Loader()
                 .GetDocumentLoader()
                 ->GetHistoryItem()
                 ->PageScaleFactor());
 }
 
 TEST_P(ParameterizedWebFrameTest, pageScaleFactorDoesntShrinkFrameView) {
   RegisterMockedHttpURLLoad("large-div.html");
 
   FixedLayoutTestWebViewClient client;
   client.screen_info_.device_scale_factor = 1;
   // Small viewport to ensure there are always scrollbars.
   int viewport_width = 64;
   int viewport_height = 48;
 
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.InitializeAndLoad(base_url_ + "large-div.html", true, nullptr,
-                                    &client, nullptr, EnableViewportSettings);
+                                    &client, nullptr, ConfigureAndroid);
   web_view_helper.Resize(WebSize(viewport_width, viewport_height));
 
   LocalFrameView* view =
       web_view_helper.WebView()->MainFrameImpl()->GetFrameView();
   int viewport_width_minus_scrollbar = viewport_width;
   int viewport_height_minus_scrollbar = viewport_height;
 
   if (view->VerticalScrollbar() &&
       !view->VerticalScrollbar()->IsOverlayScrollbar())
     viewport_width_minus_scrollbar -= 15;
@@ skipping 24 matching lines @@
   RegisterMockedHttpURLLoad("fixed_layout.html");
 
   FixedLayoutTestWebViewClient client;
   client.screen_info_.device_scale_factor = 1;
   int viewport_width = 640;
   int viewport_height = 480;
 
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.InitializeAndLoad(base_url_ + "fixed_layout.html", true,
                                     nullptr, &client, nullptr,
-                                    EnableViewportSettings);
+                                    ConfigureAndroid);
   web_view_helper.Resize(WebSize(viewport_width, viewport_height));
 
   web_view_helper.WebView()->SetPageScaleFactor(2);
 
   EXPECT_EQ(980, ToLocalFrame(web_view_helper.WebView()->GetPage()->MainFrame())
                      ->ContentLayoutItem()
                      .DocumentRect()
                      .Width());
   EXPECT_EQ(980, web_view_helper.WebView()
                      ->MainFrameImpl()
@@ skipping 13 matching lines @@
   int viewport_height = 480;
 
   for (size_t i = 0; i < WTF_ARRAY_LENGTH(device_scale_factors); ++i) {
     float device_scale_factor = device_scale_factors[i];
     float device_dpi = device_scale_factor * 160.0f;
     client.screen_info_.device_scale_factor = device_scale_factor;
 
     FrameTestHelpers::WebViewHelper web_view_helper;
     web_view_helper.InitializeAndLoad(
         base_url_ + "viewport-target-densitydpi-high.html", true, nullptr,
-        &client, nullptr, EnableViewportSettings);
+        &client, nullptr, ConfigureAndroid);
     web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);
     web_view_helper.WebView()
         ->GetSettings()
         ->SetSupportDeprecatedTargetDensityDPI(true);
     web_view_helper.Resize(WebSize(viewport_width, viewport_height));
 
     // We need to account for the fact that logical pixels are unconditionally
     // multiplied by deviceScaleFactor to produce physical pixels.
     float density_dpi_scale_ratio =
         device_scale_factor * target_dpi / device_dpi;
@@ skipping 24 matching lines @@
   FixedLayoutTestWebViewClient client;
   int viewport_width = 640;
   int viewport_height = 480;
 
   for (size_t i = 0; i < WTF_ARRAY_LENGTH(device_scale_factors); ++i) {
     client.screen_info_.device_scale_factor = device_scale_factors[i];
 
     FrameTestHelpers::WebViewHelper web_view_helper;
     web_view_helper.InitializeAndLoad(
         base_url_ + "viewport-target-densitydpi-device.html", true, nullptr,
-        &client, nullptr, EnableViewportSettings);
+        &client, nullptr, ConfigureAndroid);
     web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);
     web_view_helper.WebView()
         ->GetSettings()
         ->SetSupportDeprecatedTargetDensityDPI(true);
     web_view_helper.Resize(WebSize(viewport_width, viewport_height));
 
     EXPECT_NEAR(viewport_width * client.screen_info_.device_scale_factor,
                 web_view_helper.WebView()
                     ->MainFrameImpl()
                     ->GetFrameView()
@@ skipping 21 matching lines @@
   FixedLayoutTestWebViewClient client;
   int viewport_width = 640;
   int viewport_height = 480;
 
   for (size_t i = 0; i < WTF_ARRAY_LENGTH(device_scale_factors); ++i) {
     client.screen_info_.device_scale_factor = device_scale_factors[i];
 
     FrameTestHelpers::WebViewHelper web_view_helper;
     web_view_helper.InitializeAndLoad(
         base_url_ + "viewport-target-densitydpi-device-and-fixed-width.html",
-        true, nullptr, &client, nullptr, EnableViewportSettings);
+        true, nullptr, &client, nullptr, ConfigureAndroid);
     web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);
     web_view_helper.WebView()
         ->GetSettings()
         ->SetSupportDeprecatedTargetDensityDPI(true);
     web_view_helper.WebView()->GetSettings()->SetUseWideViewport(true);
     web_view_helper.Resize(WebSize(viewport_width, viewport_height));
 
     EXPECT_NEAR(viewport_width,
                 web_view_helper.WebView()
                     ->MainFrameImpl()
@@ skipping 16 matching lines @@
   RegisterMockedHttpURLLoad("viewport-initial-scale-less-than-1.html");
 
   FixedLayoutTestWebViewClient client;
   client.screen_info_.device_scale_factor = 1.33f;
   int viewport_width = 640;
   int viewport_height = 480;
 
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.InitializeAndLoad(
       base_url_ + "viewport-initial-scale-less-than-1.html", true, nullptr,
-      &client, nullptr, EnableViewportSettings);
+      &client, nullptr, ConfigureAndroid);
   web_view_helper.WebView()
       ->GetSettings()
       ->SetSupportDeprecatedTargetDensityDPI(true);
   web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);
   web_view_helper.WebView()->GetSettings()->SetUseWideViewport(false);
   web_view_helper.Resize(WebSize(viewport_width, viewport_height));
 
   EXPECT_NEAR(viewport_width * client.screen_info_.device_scale_factor,
               web_view_helper.WebView()
                   ->MainFrameImpl()
@@ skipping 18 matching lines @@
       "viewport-initial-scale-less-than-1-device-width.html");
 
   FixedLayoutTestWebViewClient client;
   client.screen_info_.device_scale_factor = 1.33f;
   int viewport_width = 640;
   int viewport_height = 480;
 
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.InitializeAndLoad(
       base_url_ + "viewport-initial-scale-less-than-1-device-width.html", true,
-      nullptr, &client, nullptr, EnableViewportSettings);
+      nullptr, &client, nullptr, ConfigureAndroid);
   web_view_helper.WebView()
       ->GetSettings()
       ->SetSupportDeprecatedTargetDensityDPI(true);
   web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);
   web_view_helper.WebView()->GetSettings()->SetUseWideViewport(false);
   web_view_helper.Resize(WebSize(viewport_width, viewport_height));
 
   const float kPageZoom = 0.25f;
   EXPECT_NEAR(
       viewport_width * client.screen_info_.device_scale_factor / kPageZoom,
@@ skipping 19 matching lines @@
        NoWideViewportAndNoViewportWithInitialPageScaleOverride) {
   RegisterMockedHttpURLLoad("large-div.html");
 
   FixedLayoutTestWebViewClient client;
   int viewport_width = 640;
   int viewport_height = 480;
   float enforced_page_scale_factor = 5.0f;
 
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.InitializeAndLoad(base_url_ + "large-div.html", true, nullptr,
-                                    &client, nullptr, EnableViewportSettings);
+                                    &client, nullptr, ConfigureAndroid);
   web_view_helper.WebView()->SetDefaultPageScaleLimits(0.25f, 5);
   web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);
   web_view_helper.WebView()->GetSettings()->SetUseWideViewport(false);
   web_view_helper.WebView()->SetInitialPageScaleOverride(
       enforced_page_scale_factor);
   web_view_helper.Resize(WebSize(viewport_width, viewport_height));
 
   EXPECT_NEAR(viewport_width / enforced_page_scale_factor,
               web_view_helper.WebView()
                   ->MainFrameImpl()
@@ skipping 15 matching lines @@
 TEST_P(ParameterizedWebFrameTest, NoUserScalableQuirkIgnoresViewportScale) {
   RegisterMockedHttpURLLoad("viewport-initial-scale-and-user-scalable-no.html");
 
   FixedLayoutTestWebViewClient client;
   int viewport_width = 640;
   int viewport_height = 480;
 
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.InitializeAndLoad(
       base_url_ + "viewport-initial-scale-and-user-scalable-no.html", true,
-      nullptr, &client, nullptr, EnableViewportSettings);
+      nullptr, &client, nullptr, ConfigureAndroid);
   web_view_helper.WebView()->GetSettings()->SetViewportMetaNonUserScalableQuirk(
       true);
   web_view_helper.Resize(WebSize(viewport_width, viewport_height));
 
   EXPECT_NEAR(viewport_width,
               web_view_helper.WebView()
                   ->MainFrameImpl()
                   ->GetFrameView()
                   ->GetLayoutSize()
                   .Width(),
@@ skipping 13 matching lines @@
   RegisterMockedHttpURLLoad("viewport-initial-scale-and-user-scalable-no.html");
 
   FixedLayoutTestWebViewClient client;
   client.screen_info_.device_scale_factor = 1.33f;
   int viewport_width = 640;
   int viewport_height = 480;
 
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.InitializeAndLoad(
       base_url_ + "viewport-initial-scale-and-user-scalable-no.html", true,
-      nullptr, &client, nullptr, EnableViewportSettings);
+      nullptr, &client, nullptr, ConfigureAndroid);
   web_view_helper.WebView()
       ->GetSettings()
       ->SetSupportDeprecatedTargetDensityDPI(true);
   web_view_helper.WebView()->GetSettings()->SetViewportMetaNonUserScalableQuirk(
       true);
   web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);
   web_view_helper.WebView()->GetSettings()->SetUseWideViewport(false);
   web_view_helper.Resize(WebSize(viewport_width, viewport_height));
 
   EXPECT_NEAR(viewport_width * client.screen_info_.device_scale_factor,
@@ skipping 18 matching lines @@
        NoUserScalableQuirkIgnoresViewportScaleForWideViewport) {
   RegisterMockedHttpURLLoad("viewport-2x-initial-scale-non-user-scalable.html");
 
   FixedLayoutTestWebViewClient client;
   int viewport_width = 640;
   int viewport_height = 480;
 
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.InitializeAndLoad(
       base_url_ + "viewport-2x-initial-scale-non-user-scalable.html", true,
-      nullptr, &client, nullptr, EnableViewportSettings);
+      nullptr, &client, nullptr, ConfigureAndroid);
   web_view_helper.WebView()->GetSettings()->SetViewportMetaNonUserScalableQuirk(
       true);
   web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);
   web_view_helper.WebView()->GetSettings()->SetUseWideViewport(true);
   web_view_helper.Resize(WebSize(viewport_width, viewport_height));
 
   EXPECT_NEAR(viewport_width,
               web_view_helper.WebView()
                   ->MainFrameImpl()
                   ->GetFrameView()
@@ skipping 14 matching lines @@
        DesktopPageCanBeZoomedInWhenWideViewportIsTurnedOff) {
   RegisterMockedHttpURLLoad("no_viewport_tag.html");
 
   FixedLayoutTestWebViewClient client;
   int viewport_width = 640;
   int viewport_height = 480;
 
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.InitializeAndLoad(base_url_ + "no_viewport_tag.html", true,
                                     nullptr, &client, nullptr,
-                                    EnableViewportSettings);
+                                    ConfigureAndroid);
   web_view_helper.WebView()->SetDefaultPageScaleLimits(0.25f, 5);
   web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);
   web_view_helper.WebView()->GetSettings()->SetUseWideViewport(false);
   web_view_helper.Resize(WebSize(viewport_width, viewport_height));
 
   EXPECT_NEAR(1.0f, web_view_helper.WebView()->PageScaleFactor(), 0.01f);
   EXPECT_NEAR(1.0f, web_view_helper.WebView()->MinimumPageScaleFactor(), 0.01f);
   EXPECT_NEAR(5.0f, web_view_helper.WebView()->MaximumPageScaleFactor(), 0.01f);
 }
 
 TEST_P(ParameterizedWebFrameTest, AtViewportInsideAtMediaInitialViewport) {
   RegisterMockedHttpURLLoad("viewport-inside-media.html");
 
   FixedLayoutTestWebViewClient client;
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.InitializeAndLoad(base_url_ + "viewport-inside-media.html",
                                     true, nullptr, &client, nullptr,
-                                    EnableViewportSettings);
+                                    ConfigureAndroid);
   web_view_helper.Resize(WebSize(640, 480));
 
   EXPECT_EQ(2000, web_view_helper.WebView()
                       ->MainFrameImpl()
                       ->GetFrameView()
                       ->GetLayoutSize()
                       .Width());
 
   web_view_helper.Resize(WebSize(1200, 480));
 
   EXPECT_EQ(1200, web_view_helper.WebView()
                       ->MainFrameImpl()
                       ->GetFrameView()
                       ->GetLayoutSize()
                       .Width());
 }
 
 TEST_P(ParameterizedWebFrameTest, AtViewportAffectingAtMediaRecalcCount) {
   RegisterMockedHttpURLLoad("viewport-and-media.html");
 
   FixedLayoutTestWebViewClient client;
   FrameTestHelpers::WebViewHelper web_view_helper;
-  web_view_helper.Initialize(true, nullptr, &client, nullptr,
-                             EnableViewportSettings);
+  web_view_helper.Initialize(true, nullptr, &client, nullptr, ConfigureAndroid);
   web_view_helper.Resize(WebSize(640, 480));
   FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrame(),
                               base_url_ + "viewport-and-media.html");
 
   Document* document =
       web_view_helper.WebView()->MainFrameImpl()->GetFrame()->GetDocument();
   EXPECT_EQ(2000, web_view_helper.WebView()
                       ->MainFrameImpl()
                       ->GetFrameView()
                       ->GetLayoutSize()
                       .Width());
 
   // The styleForElementCount() should match the number of elements for a single
   // pass of computed styles construction for the document.
   EXPECT_EQ(10u, document->GetStyleEngine().StyleForElementCount());
   EXPECT_EQ(Color(0, 128, 0),
             document->body()->GetComputedStyle()->VisitedDependentColor(
                 CSSPropertyColor));
 }
 
 TEST_P(ParameterizedWebFrameTest, AtViewportWithViewportLengths) {
   RegisterMockedHttpURLLoad("viewport-lengths.html");
 
   FixedLayoutTestWebViewClient client;
   FrameTestHelpers::WebViewHelper web_view_helper;
-  web_view_helper.Initialize(true, nullptr, &client, nullptr,
-                             EnableViewportSettings);
+  web_view_helper.Initialize(true, nullptr, &client, nullptr, ConfigureAndroid);
   web_view_helper.Resize(WebSize(800, 600));
   FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrame(),
                               base_url_ + "viewport-lengths.html");
 
   LocalFrameView* view =
       web_view_helper.WebView()->MainFrameImpl()->GetFrameView();
   EXPECT_EQ(400, view->GetLayoutSize().Width());
   EXPECT_EQ(300, view->GetLayoutSize().Height());
 
   web_view_helper.Resize(WebSize(1000, 400));
@@ skipping 18 matching lines @@
       const WebSize scroll_offset,
       const WebSize viewport_size,
       const bool should_scale_relative_to_viewport_width) {
     RegisterMockedHttpURLLoad(url);
 
     const float aspect_ratio =
         static_cast<float>(viewport_size.width) / viewport_size.height;
 
     FrameTestHelpers::WebViewHelper web_view_helper;
     web_view_helper.InitializeAndLoad(base_url_ + url, true, nullptr, nullptr,
-                                      nullptr, EnableViewportSettings);
+                                      nullptr, ConfigureAndroid);
     web_view_helper.WebView()->SetDefaultPageScaleLimits(0.25f, 5);
 
     // Origin scrollOffsets preserved under resize.
     {
       web_view_helper.Resize(
           WebSize(viewport_size.width, viewport_size.height));
       web_view_helper.WebView()->SetPageScaleFactor(initial_page_scale_factor);
       ASSERT_EQ(viewport_size, web_view_helper.WebView()->Size());
       ASSERT_EQ(initial_page_scale_factor,
                 web_view_helper.WebView()->PageScaleFactor());
@@ skipping 99 matching lines @@
   RegisterMockedHttpURLLoad("fixed_layout.html");
 
   FixedLayoutTestWebViewClient client;
   client.screen_info_.device_scale_factor = 1;
   int viewport_width = 640;
   int viewport_height = 480;
 
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.InitializeAndLoad(base_url_ + "fixed_layout.html", true,
                                     nullptr, &client, nullptr,
-                                    EnableViewportSettings);
+                                    ConfigureAndroid);
   web_view_helper.Resize(WebSize(viewport_width, viewport_height));
 
   LocalFrameView* view =
       web_view_helper.WebView()->MainFrameImpl()->GetFrameView();
   EXPECT_EQ(view->ScrollSize(kHorizontalScrollbar),
             view->ContentsSize().Width() - view->VisibleContentRect().Width());
   EXPECT_EQ(
       view->ScrollSize(kVerticalScrollbar),
       view->ContentsSize().Height() - view->VisibleContentRect().Height());
 
@@ skipping 10 matching lines @@
   RegisterMockedHttpURLLoad("no_scale_for_you.html");
 
   FixedLayoutTestWebViewClient client;
   client.screen_info_.device_scale_factor = 1;
   int viewport_width = 640;
   int viewport_height = 480;
 
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.InitializeAndLoad(base_url_ + "no_scale_for_you.html", true,
                                     nullptr, &client, nullptr,
-                                    EnableViewportSettings);
+                                    ConfigureAndroid);
   web_view_helper.WebView()->SetDefaultPageScaleLimits(0.25f, 5);
   web_view_helper.Resize(WebSize(viewport_width, viewport_height));
 
   EXPECT_EQ(2.0f, web_view_helper.WebView()->MinimumPageScaleFactor());
   EXPECT_EQ(2.0f, web_view_helper.WebView()->MaximumPageScaleFactor());
 
   web_view_helper.WebView()->SetIgnoreViewportTagScaleLimits(true);
   web_view_helper.WebView()->UpdateAllLifecyclePhases();
 
   EXPECT_EQ(1.0f, web_view_helper.WebView()->MinimumPageScaleFactor());
@@ skipping 3052 matching lines @@
 TEST_P(ParameterizedWebFrameTest, DisambiguationPopupMobileSite) {
   const std::string html_file = "disambiguation_popup_mobile_site.html";
   RegisterMockedHttpURLLoad(html_file);
 
   DisambiguationPopupTestWebViewClient client;
 
   // Make sure we initialize to minimum scale, even if the window size
   // only becomes available after the load begins.
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.InitializeAndLoad(base_url_ + html_file, true, nullptr,
-                                    &client, nullptr, EnableViewportSettings);
+                                    &client, nullptr, ConfigureAndroid);
   web_view_helper.Resize(WebSize(1000, 1000));
 
   client.ResetTriggered();
   web_view_helper.WebView()->HandleInputEvent(FatTap(0, 0));
   EXPECT_FALSE(client.Triggered());
 
   client.ResetTriggered();
   web_view_helper.WebView()->HandleInputEvent(FatTap(200, 115));
   EXPECT_FALSE(client.Triggered());
 
@@ skipping 13 matching lines @@
 TEST_P(ParameterizedWebFrameTest, DisambiguationPopupViewportSite) {
   const std::string html_file = "disambiguation_popup_viewport_site.html";
   RegisterMockedHttpURLLoad(html_file);
 
   DisambiguationPopupTestWebViewClient client;
 
   // Make sure we initialize to minimum scale, even if the window size
   // only becomes available after the load begins.
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.InitializeAndLoad(base_url_ + html_file, true, nullptr,
-                                    &client, nullptr, EnableViewportSettings);
+                                    &client, nullptr, ConfigureAndroid);
   web_view_helper.Resize(WebSize(1000, 1000));
 
   client.ResetTriggered();
   web_view_helper.WebView()->HandleInputEvent(FatTap(0, 0));
   EXPECT_FALSE(client.Triggered());
 
   client.ResetTriggered();
   web_view_helper.WebView()->HandleInputEvent(FatTap(200, 115));
   EXPECT_FALSE(client.Triggered());
 
@@ skipping 1549 matching lines @@
                                     true, &client);
 
   EXPECT_EQ(1, client.CallCount());
 }
 
 TEST_P(ParameterizedWebFrameTest, fixedPositionInFixedViewport) {
   RegisterMockedHttpURLLoad("fixed-position-in-fixed-viewport.html");
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.InitializeAndLoad(
       base_url_ + "fixed-position-in-fixed-viewport.html", true, nullptr,
-      nullptr, nullptr, EnableViewportSettings);
+      nullptr, nullptr, ConfigureAndroid);
 
   WebViewBase* web_view = web_view_helper.WebView();
   web_view_helper.Resize(WebSize(100, 100));
 
   Document* document = web_view->MainFrameImpl()->GetFrame()->GetDocument();
   Element* bottom_fixed = document->getElementById("bottom-fixed");
   Element* top_bottom_fixed = document->getElementById("top-bottom-fixed");
   Element* right_fixed = document->getElementById("right-fixed");
   Element* left_right_fixed = document->getElementById("left-right-fixed");
 
@@ skipping 101 matching lines @@
   RegisterMockedHttpURLLoad("rtl-overview-mode.html");
 
   FixedLayoutTestWebViewClient client;
   client.screen_info_.device_scale_factor = 1;
   int viewport_width = 640;
   int viewport_height = 480;
 
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.InitializeAndLoad(base_url_ + "rtl-overview-mode.html", true,
                                     nullptr, &client, nullptr,
-                                    EnableViewportSettings);
+                                    ConfigureAndroid);
   web_view_helper.WebView()->SetInitialPageScaleOverride(-1);
   web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);
   web_view_helper.WebView()->GetSettings()->SetLoadWithOverviewMode(true);
   web_view_helper.WebView()->GetSettings()->SetUseWideViewport(true);
   web_view_helper.Resize(WebSize(viewport_width, viewport_height));
   web_view_helper.WebView()->UpdateAllLifecyclePhases();
 
   LocalFrameView* frame_view =
       web_view_helper.WebView()->MainFrameImpl()->GetFrameView();
   EXPECT_LT(frame_view->MaximumScrollOffset().Width(), 0);
@@ skipping 2964 matching lines @@
 
 // Ensure that the root layer -- whose size is ordinarily derived from the
 // content size -- maintains a minimum height matching the viewport in cases
 // where the content is smaller.
 TEST_F(WebFrameTest, RootLayerMinimumHeight) {
   constexpr int kViewportWidth = 320;
   constexpr int kViewportHeight = 640;
   constexpr int kBrowserControlsHeight = 100;
 
   FrameTestHelpers::WebViewHelper web_view_helper;
-  web_view_helper.Initialize(true, nullptr, nullptr, nullptr,
-                             EnableViewportSettings);
+  web_view_helper.Initialize(true, nullptr, nullptr, nullptr, ConfigureAndroid);
   WebViewBase* web_view = web_view_helper.WebView();
   web_view->ResizeWithBrowserControls(
       WebSize(kViewportWidth, kViewportHeight - kBrowserControlsHeight),
       kBrowserControlsHeight, true);
 
-  InitializeWithHTML(*web_view->MainFrameImpl()->GetFrame(),
-                     "<!DOCTYPE html>"
-                     "<style>"
-                     "  html, body {width:100%;height:540px;margin:0px}"
-                     "  #elem {"
-                     "    overflow: scroll;"
-                     "    width: 100px;"
-                     "    height: 10px;"
-                     "    position: fixed;"
-                     "    left: 0px;"
-                     "    bottom: 0px;"
-                     "  }"
-                     "</style>"
-                     "<div id='elem'></div>");
+  InitializeWithHTML(
+      *web_view->MainFrameImpl()->GetFrame(),
+      "<!DOCTYPE html>"
+      "<meta name='viewport' content='width=device-width, initial-scale=1'>"
+      "<style>"
+      "  html, body {width:100%;height:540px;margin:0px}"
+      "  #elem {"
+      "    overflow: scroll;"
+      "    width: 100px;"
+      "    height: 10px;"
+      "    position: fixed;"
+      "    left: 0px;"
+      "    bottom: 0px;"
+      "  }"
+      "</style>"
+      "<div id='elem'></div>");
   web_view->UpdateAllLifecyclePhases();
 
   Document* document = web_view->MainFrameImpl()->GetFrame()->GetDocument();
   LocalFrameView* frame_view = web_view->MainFrameImpl()->GetFrameView();
   PaintLayerCompositor* compositor =
       frame_view->GetLayoutViewItem().Compositor();
 
   EXPECT_EQ(kViewportHeight - kBrowserControlsHeight,
             compositor->RootLayer()->BoundingBoxForCompositing().Height());
 
@@ skipping 1191 matching lines @@
     if (obj->IsText()) {
       LayoutText* layout_text = ToLayoutText(obj);
       text = layout_text->GetText();
       break;
     }
   }
   EXPECT_EQ("foo alt", text.Utf8());
 }
 
 }  // namespace blink