Current work-in-progress crbug.com/567021

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

Index: third_party/WebKit/Source/web/tests/WebFrameTest.cpp
diff --git a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
index b2d4ad274c57325a801197399a9ac6e4980b9bcb..31e6f67e8ae865ce4951b74500840e2137dc86a8 100644
--- a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
+++ b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
@@ -218,14 +218,10 @@ protected:
 
     void applyViewportStyleOverride(FrameTestHelpers::WebViewHelper* webViewHelper)
     {
-        StyleSheetContents* styleSheet = StyleSheetContents::create(CSSParserContext(UASheetMode, 0));
-        styleSheet->parseString(loadResourceAsASCIIString("viewportAndroid.css"));
-        RuleSet* ruleSet = RuleSet::create();
-        ruleSet->addRulesFromSheet(styleSheet, MediaQueryEvaluator("screen"));
-
         Document* document = toLocalFrame(webViewHelper->webViewImpl()->page()->mainFrame())->document();
-        document->ensureStyleResolver().viewportStyleResolver()->collectViewportRules(ruleSet, ViewportStyleResolver::UserAgentOrigin);
-        document->ensureStyleResolver().viewportStyleResolver()->resolve();
+        document->settings()->setViewportStyle(WebViewportStyle::Mobile);
+        document->styleEngine().ensureViewportStyleResolver().collectViewportRulesFromUASheets();
+        document->styleEngine().ensureViewportStyleResolver().resolve();
     }
 
     static void configueCompositingWebView(WebSettings* settings)