Count presence of viewport tag as mobile-friendly

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

Index: third_party/WebKit/Source/web/tests/ViewportTest.cpp
diff --git a/third_party/WebKit/Source/web/tests/ViewportTest.cpp b/third_party/WebKit/Source/web/tests/ViewportTest.cpp
index 4b61d724ad390605cc9acc1fed995e6040c3e454..5cd9da94f367214a48a63b2b92d34efb69484405 100644
--- a/third_party/WebKit/Source/web/tests/ViewportTest.cpp
+++ b/third_party/WebKit/Source/web/tests/ViewportTest.cpp
@@ -2944,8 +2944,7 @@ TEST_F(ViewportTest, viewportTriggersGpuRasterization) {
           "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(
@@ -2953,16 +2952,14 @@ TEST_F(ViewportTest, viewportTriggersGpuRasterization) {
           "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");
@@ -2971,48 +2968,42 @@ TEST_F(ViewportTest, viewportTriggersGpuRasterization) {
           "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