Translate viewport related meta tags into @viewport descriptors as suggested by the CSS Device Adap…

Source/WebKit/chromium/tests/WebFrameTest.cpp

Index: Source/WebKit/chromium/tests/WebFrameTest.cpp
diff --git a/Source/WebKit/chromium/tests/WebFrameTest.cpp b/Source/WebKit/chromium/tests/WebFrameTest.cpp
index 919f71bea977ab6ed680381e30e66ec134a934d4..5f37345a3f64d94d789c03cc9ad282802e4764c4 100644
--- a/Source/WebKit/chromium/tests/WebFrameTest.cpp
+++ b/Source/WebKit/chromium/tests/WebFrameTest.cpp
@@ -367,9 +367,9 @@ TEST_F(WebFrameTest, ChangeInFixedLayoutTriggersTextAutosizingRecalculate)
     }
     EXPECT_TRUE(multiplierSetAtLeastOnce);
 
-    WebCore::ViewportArguments arguments = document->viewportArguments();
-    arguments.width += 10;
-    webViewImpl->updatePageDefinedPageScaleConstraints(arguments);
+    // Modify layout size to invalidate text autosizing multipliers.
+    webViewImpl->addUserStyleSheet("@viewport{width:1000px;}", WebVector<WebString>(), WebView::UserContentInjectInAllFrames, WebView::UserStyleInjectInExistingDocuments);
+    webViewImpl->layout();
 
     bool multiplierCheckedAtLeastOnce = false;
     renderer = document->renderer();
@@ -630,7 +630,7 @@ TEST_F(WebFrameTest, setInitialPageScaleFactorPermanently)
 
     FixedLayoutTestWebViewClient client;
     client.m_screenInfo.deviceScaleFactor = 1;
-    float enforcedPageScaleFactor = 2.0f;
+    float enforcedPageScaleFactor = 2;
 
     m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client);
     m_webView->settings()->setSupportDeprecatedTargetDensityDPI(true);
@@ -666,8 +666,8 @@ TEST_F(WebFrameTest, PermanentInitialPageScaleFactorOverridesLoadWithOverviewMod
 
     m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "viewport-auto-initial-scale.html", true, 0, &client);
     m_webView->enableFixedLayoutMode(true);
-    m_webView->settings()->setSupportDeprecatedTargetDensityDPI(true);
     m_webView->settings()->setViewportEnabled(true);
+    m_webView->settings()->setSupportDeprecatedTargetDensityDPI(true);
     m_webView->settings()->setLoadWithOverviewMode(false);
     m_webView->setInitialPageScaleOverride(enforcedPageScalePactor);
     m_webView->resize(WebSize(viewportWidth, viewportHeight));