Simpler viewportAndroid.css setup for WebFrameTests.

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 209 matching lines @@
 
   void registerMockedHttpURLLoadWithMimeType(const std::string& fileName,
                                              const std::string& mimeType) {
     URLTestHelpers::registerMockedURLFromBaseURL(
         WebString::fromUTF8(m_baseURL.c_str()),
         WebString::fromUTF8(fileName.c_str()), WebString::fromUTF8(mimeType));
   }
 
   void applyViewportStyleOverride(
       FrameTestHelpers::WebViewHelper* webViewHelper) {
-    StyleSheetContents* styleSheet =
-        StyleSheetContents::create(CSSParserContext(UASheetMode, nullptr));
-    styleSheet->parseString(loadResourceAsASCIIString("viewportAndroid.css"));
-    RuleSet* ruleSet = RuleSet::create();
-    ruleSet->addRulesFromSheet(styleSheet, MediaQueryEvaluator("screen"));
-
-    Document* document =
-        toLocalFrame(webViewHelper->webView()->page()->mainFrame())->document();
-    document->ensureStyleResolver()
-        .viewportStyleResolver()
-        ->collectViewportRules(ruleSet, ViewportStyleResolver::UserAgentOrigin);
-    document->ensureStyleResolver().viewportStyleResolver()->resolve();
+    webViewHelper->webView()->settings()->setViewportStyle(
+        WebViewportStyle::Mobile);
   }
 
-  static void configueCompositingWebView(WebSettings* settings) {
+  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);
   }
@@ skipping 2650 matching lines @@
 {
   registerMockedHttpURLLoad("large-div.html");
 
   int viewWidth = 500;
   int viewHeight = 500;
 
   std::unique_ptr<FakeCompositingWebViewClient> fakeCompositingWebViewClient =
       wrapUnique(new FakeCompositingWebViewClient());
   FrameTestHelpers::WebViewHelper webViewHelper;
   webViewHelper.initialize(true, nullptr, fakeCompositingWebViewClient.get(),
-                           nullptr, &configueCompositingWebView);
+                           nullptr, &configureCompositingWebView);
 
   webViewHelper.resize(WebSize(viewWidth, viewHeight));
   FrameTestHelpers::loadFrame(webViewHelper.webView()->mainFrame(),
                               m_baseURL + "large-div.html");
 
   FrameView* view = webViewHelper.webView()->mainFrameImpl()->frameView();
   EXPECT_TRUE(
       view->layoutViewItem().compositor()->layerForHorizontalScrollbar());
   EXPECT_TRUE(view->layoutViewItem().compositor()->layerForVerticalScrollbar());
 
@@ skipping 4234 matching lines @@
   EXPECT_FALSE(client.replacesCurrentHistoryItem());
 }
 
 // Test verifies that layout will change a layer's scrollable attibutes
 TEST_F(WebFrameTest, overflowHiddenRewrite) {
   registerMockedHttpURLLoad("non-scrollable.html");
   std::unique_ptr<FakeCompositingWebViewClient> fakeCompositingWebViewClient =
       wrapUnique(new FakeCompositingWebViewClient());
   FrameTestHelpers::WebViewHelper webViewHelper;
   webViewHelper.initialize(true, nullptr, fakeCompositingWebViewClient.get(),
-                           nullptr, &configueCompositingWebView);
+                           nullptr, &configureCompositingWebView);
 
   webViewHelper.resize(WebSize(100, 100));
   FrameTestHelpers::loadFrame(webViewHelper.webView()->mainFrame(),
                               m_baseURL + "non-scrollable.html");
 
   PaintLayerCompositor* compositor = webViewHelper.webView()->compositor();
   ASSERT_TRUE(compositor->scrollLayer());
 
   // Verify that the WebLayer is not scrollable initially.
   GraphicsLayer* scrollLayer = compositor->scrollLayer();
@@ skipping 3016 matching lines @@
   webViewHelper.webView()->handleInputEvent(endEvent);
   webViewHelper.webView()->handleInputEvent(updateEvent);
 
   // Try a full Begin/Update/End cycle.
   webViewHelper.webView()->handleInputEvent(beginEvent);
   webViewHelper.webView()->handleInputEvent(updateEvent);
   webViewHelper.webView()->handleInputEvent(endEvent);
 }
 
 }  // namespace blink