Count presence of viewport tag as mobile-friendly

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

 /*
  * Copyright (C) 2013 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 2926 matching lines @@
 TEST_F(ViewportTest, viewportTriggersGpuRasterization) {
   FrameTestHelpers::WebViewHelper webViewHelper;
 
   registerMockedHttpURLLoad(
       "viewport/viewport-gpu-rasterization-disabled-without-viewport.html");
   webViewHelper.initializeAndLoad(
       m_baseURL +
           "viewport/viewport-gpu-rasterization-disabled-without-viewport.html",
       true, nullptr, nullptr, nullptr, setViewportSettings);
   webViewHelper.webView()->resize(WebSize(640, 480));
-  EXPECT_FALSE(webViewHelper.webView()
-                   ->matchesHeuristicsForGpuRasterizationForTesting());
+  EXPECT_TRUE(webViewHelper.webView()->isDesktopSiteOnMobileForTesting());
   // Also test that setting enableViewport to false (as on desktop Chrome)
   // supports GPU raster unconditionally.
   webViewHelper.initializeAndLoad(
       m_baseURL +
           "viewport/viewport-gpu-rasterization-disabled-without-viewport.html",
       true);
   webViewHelper.webView()->resize(WebSize(640, 480));
-  EXPECT_TRUE(webViewHelper.webView()
-                  ->matchesHeuristicsForGpuRasterizationForTesting());
+  EXPECT_FALSE(webViewHelper.webView()->isDesktopSiteOnMobileForTesting());
 
   registerMockedHttpURLLoad("viewport/viewport-gpu-rasterization.html");
   webViewHelper.initializeAndLoad(
       m_baseURL + "viewport/viewport-gpu-rasterization.html", true, nullptr,
       nullptr, nullptr, setViewportSettings);
   webViewHelper.webView()->resize(WebSize(640, 480));
-  EXPECT_TRUE(webViewHelper.webView()
-                  ->matchesHeuristicsForGpuRasterizationForTesting());
+  EXPECT_FALSE(webViewHelper.webView()->isDesktopSiteOnMobileForTesting());
 
   registerMockedHttpURLLoad(
       "viewport/viewport-gpu-rasterization-expanded-heuristics.html");
   webViewHelper.initializeAndLoad(
       m_baseURL +
           "viewport/viewport-gpu-rasterization-expanded-heuristics.html",
       true, nullptr, nullptr, nullptr, setViewportSettings);
   webViewHelper.webView()->resize(WebSize(640, 480));
-  EXPECT_TRUE(webViewHelper.webView()
-                  ->matchesHeuristicsForGpuRasterizationForTesting());
+  EXPECT_FALSE(webViewHelper.webView()->isDesktopSiteOnMobileForTesting());
 
   registerMockedHttpURLLoad("viewport/viewport-1.html");
   webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-1.html", true,
                                   nullptr, nullptr, nullptr,
                                   setViewportSettings);
   webViewHelper.webView()->resize(WebSize(640, 480));
-  EXPECT_TRUE(webViewHelper.webView()
-                  ->matchesHeuristicsForGpuRasterizationForTesting());
+  EXPECT_FALSE(webViewHelper.webView()->isDesktopSiteOnMobileForTesting());
 
   registerMockedHttpURLLoad("viewport/viewport-15.html");
   webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-15.html", true,
                                   nullptr, nullptr, nullptr,
                                   setViewportSettings);
   webViewHelper.webView()->resize(WebSize(640, 480));
-  EXPECT_TRUE(webViewHelper.webView()
-                  ->matchesHeuristicsForGpuRasterizationForTesting());
+  EXPECT_FALSE(webViewHelper.webView()->isDesktopSiteOnMobileForTesting());
 
   registerMockedHttpURLLoad("viewport/viewport-130.html");
   webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-130.html",
                                   true, nullptr, nullptr, nullptr,
                                   setViewportSettings);
   webViewHelper.webView()->resize(WebSize(640, 480));
-  EXPECT_TRUE(webViewHelper.webView()
-                  ->matchesHeuristicsForGpuRasterizationForTesting());
+  EXPECT_FALSE(webViewHelper.webView()->isDesktopSiteOnMobileForTesting());
 
   registerMockedHttpURLLoad("viewport/viewport-legacy-handheldfriendly.html");
   webViewHelper.initializeAndLoad(
       m_baseURL + "viewport/viewport-legacy-handheldfriendly.html", true,
       nullptr, nullptr, nullptr, setViewportSettings);
   webViewHelper.webView()->resize(WebSize(640, 480));
-  EXPECT_TRUE(webViewHelper.webView()
-                  ->matchesHeuristicsForGpuRasterizationForTesting());
+  EXPECT_FALSE(webViewHelper.webView()->isDesktopSiteOnMobileForTesting());
 
   registerMockedHttpURLLoad("viewport/viewport-legacy-mobileoptimized.html");
   webViewHelper.initializeAndLoad(
       m_baseURL + "viewport/viewport-legacy-handheldfriendly.html", true,
       nullptr, nullptr, nullptr, setViewportSettings);
   webViewHelper.webView()->resize(WebSize(640, 480));
-  EXPECT_TRUE(webViewHelper.webView()
-                  ->matchesHeuristicsForGpuRasterizationForTesting());
+  EXPECT_FALSE(webViewHelper.webView()->isDesktopSiteOnMobileForTesting());
 }
 
 class ConsoleMessageWebFrameClient
     : public FrameTestHelpers::TestWebFrameClient {
  public:
   virtual void didAddMessageToConsole(const WebConsoleMessage& msg,
                                       const WebString& sourceName,
                                       unsigned sourceLine,
                                       const WebString& stackTrace) {
     messages.append(msg);
@@ skipping 173 matching lines @@
       m_baseURL + "viewport/viewport-warnings-7.html", true, &webFrameClient,
       nullptr, nullptr, setViewportSettings);
 
   Page* page = webViewHelper.webView()->page();
   runViewportTest(page, 320, 352);
 
   EXPECT_EQ(0U, webFrameClient.messages.size());
 }
 
 }  // namespace blink