Revert "[client-hints] Viewport-Width correct value for navigation requests"

This reverts commit 66c9faff.

Reason for revert:

Findit (https://goo.gl/kROfz5) identified CL at revision 826750 as the
culprit for flakes in the build cycles as shown on:
https://analysis.chromium.org/p/chromium/flake-portal/analysis/culprit?key=ag9zfmZpbmRpdC1mb3ItbWVyQwsSDEZsYWtlQ3VscHJpdCIxY2hyb21pdW0vNjZjOWZhZmYwYTZjNmFkZDYzNGNhOTIzOTQyNjg4NmFkMzA3NTJiNQw

Sample Failed Build: https://ci.chromium.org/b/8863818632966090416

Sample Failed Step: blink_web_tests on Mac-10.15

Sample Flaky Test: virtual/disable-user-agent-client-hint-feature/external/wpt/client-hints/viewport-width-window.https.html

Original change's description:
> [client-hints] Viewport-Width correct value for navigation requests
> 
> Currently, Viewport-Width hints send the display width for navigation
> requests, rather than the actual viewport width.
> This CL fixes that for iframes and for new windows that have the same
> viewport as their opener.
> 
> Bug: 825892
> Change-Id: Ib01f394325ed3753b9a89dbdbcada1db0d3b029c
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2494876
> Commit-Queue: Yoav Weiss <yoavweiss@chromium.org>
> Commit-Queue: Arthur Sonzogni <arthursonzogni@chromium.org>
> Reviewed-by: Arthur Sonzogni <arthursonzogni@chromium.org>
> Reviewed-by: Tarun Bansal <tbansal@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#826750}


Change-Id: I6a36b74e8791409b90fd84a81bb2ef2f29d29eea
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 825892
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2535873
Cr-Commit-Position: refs/heads/master@{#826951}

content/browser/client_hints/client_hints.cc

@@ -249,22 +249,27 @@ void AddDPRHeader(net::HttpRequestHeaders* headers,
 
 void AddViewportWidthHeader(net::HttpRequestHeaders* headers,
                             BrowserContext* context,
-                            const GURL& url,
-                            FrameTreeNode* frame_tree_node) {
+                            const GURL& url) {
   DCHECK(headers);
   DCHECK(context);
-  DCHECK(frame_tree_node);
-  int viewport_width = frame_tree_node->current_frame_host()
-                           ->GetRenderViewHost()
-                           ->GetWidget()
-                           ->GetView()
-                           ->GetVisibleViewportSize()
-                           .width();
+  // The default value on Android. See
+  // https://cs.chromium.org/chromium/src/third_party/WebKit/Source/core/css/viewportAndroid.css.
+  double viewport_width = 980;
+
+#if !defined(OS_ANDROID)
   double device_scale_factor = GetDeviceScaleFactor();
-  viewport_width /= GetZoomFactor(context, url) * device_scale_factor;
+  viewport_width = (display::Screen::GetScreen()
+                        ->GetPrimaryDisplay()
+                        .GetSizeInPixel()
+                        .width()) /
+                   GetZoomFactor(context, url) / device_scale_factor;
+#endif  // !OS_ANDROID
   DCHECK_LT(0, viewport_width);
-  SetHeaderToInt(headers, network::mojom::WebClientHintsType::kViewportWidth,
-                 viewport_width);
+  // TODO(yoav): Find out why this 0 check is needed...
+  if (viewport_width > 0) {
+    SetHeaderToInt(headers, network::mojom::WebClientHintsType::kViewportWidth,
+                   viewport_width);
+  }
 }
 
 void AddRttHeader(net::HttpRequestHeaders* headers,
@@ -618,7 +623,7 @@ void AddNavigationRequestClientHintsHeaders(
   }
   if (ShouldAddClientHint(data,
                           network::mojom::WebClientHintsType::kViewportWidth)) {
-    AddViewportWidthHeader(headers, context, url, frame_tree_node);
+    AddViewportWidthHeader(headers, context, url);
   }
   network::NetworkQualityTracker* network_quality_tracker =
       delegate->GetNetworkQualityTracker();

third_party/blink/web_tests/TestExpectations

@@ -6205,8 +6205,6 @@ crbug.com/1139052 virtual/webrtc-wpt-plan-b/external/wpt/webrtc/protocol/rtp-dem
 
 crbug.com/1137228 [ Mac ] external/wpt/infrastructure/testdriver/click_iframe_crossorigin.sub.html [ Pass Failure ]
 
-crbug.com/825892 external/wpt/client-hints/viewport-width-window-different-dimensions.https.html [ Failure ]
-
 # Rename document.featurePolicy to document.permissionsPolicy
 crbug.com/1123116 external/wpt/permissions-policy/payment-supported-by-permissions-policy.tentative.html [ Failure ]
 crbug.com/1123116 external/wpt/permissions-policy/permissions-policy-frame-policy-allowed-for-all.https.sub.html [ Failure ]

third_party/blink/web_tests/external/wpt/client-hints/resources/viewport-frame.py

-def main(request, response):
-    """
-    postMessage Viewport-Width headers
-    """
-
-    if b"viewport-width" in request.headers:
-        result = request.headers["viewport-width"]
-    else:
-        result = u"FAIL"
-
-    headers = [(b"Content-Type", b"text/html"),
-               (b"Access-Control-Allow-Origin", b"*")]
-    content = b'''
-<script>
-  let parentOrOpener = window.opener || window.parent;
-  parentOrOpener.postMessage({ viewport: '%s' }, "*");
-</script>
-''' % (result)
-    return 200, headers, content

third_party/blink/web_tests/external/wpt/client-hints/resources/viewport-measurement.html

-<script>
-(async () => {
-  const response = await fetch("viewport.py");
-  const body = await response.text();
-  parent.postMessage(body, "*");
-})();
-</script>
-

third_party/blink/web_tests/external/wpt/client-hints/resources/viewport.py

-def main(request, response):
-    """
-    Reflect Viewport-Width headers
-    """
-
-    if b"viewport-width" in request.headers:
-        result = request.headers["viewport-width"]
-    else:
-        result = u"FAIL"
-
-    headers = [(b"Content-Type", b"text/html"),
-               (b"Access-Control-Allow-Origin", b"*")]
-    return 200, headers, result

third_party/blink/web_tests/external/wpt/client-hints/viewport-width-iframe.https.html

-<html>
-<body>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script>
-promise_test(t => {
-  return new Promise(resolve => {
-    window.addEventListener("message", t.step_func(e => {
-      assert_equals(e.data.viewport, window.innerWidth.toString());
-      resolve();
-    }));
-  });
-});
-</script>
-<iframe src="resources/viewport-frame.py" width=503></iframe>

third_party/blink/web_tests/external/wpt/client-hints/viewport-width-iframe.https.html.headers

-Accept-CH: Viewport-Width
-

third_party/blink/web_tests/external/wpt/client-hints/viewport-width-subresource.https.html

-<html>
-<body>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script>
-promise_test(t => {
-  return new Promise(resolve => {
-    window.addEventListener("message", t.step_func(e => {
-      assert_equals(e.data, "503");
-      resolve();
-    }));
-  });
-});
-</script>
-<iframe src="resources/viewport-measurement.html" width=503>

third_party/blink/web_tests/external/wpt/client-hints/viewport-width-subresource.https.html.headers

-Accept-CH: Viewport-Width
-

third_party/blink/web_tests/external/wpt/client-hints/viewport-width-window-different-dimensions.https.html

-<html>
-<body>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script>
-promise_test(t => {
-  return new Promise(resolve => {
-    window.addEventListener("message", t.step_func(e => {
-      assert_equals(e.data.viewport, "503");
-      resolve();
-    }));
-  });
-});
-window.open("resources/viewport-frame.py", "", "width=503");
-</script>

third_party/blink/web_tests/external/wpt/client-hints/viewport-width-window-different-dimensions.https.html.headers

-Accept-CH: Viewport-Width
-

third_party/blink/web_tests/external/wpt/client-hints/viewport-width-window.https.html

-<html>
-<body>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script>
-promise_test(t => {
-  return new Promise(resolve => {
-    window.addEventListener("message", t.step_func(e => {
-      assert_equals(e.data.viewport, window.innerWidth.toString());
-      resolve();
-    }));
-  });
-});
-window.open("resources/viewport-frame.py", "");
-</script>

third_party/blink/web_tests/external/wpt/client-hints/viewport-width-window.https.html.headers

-Accept-CH: Viewport-Width
-

third_party/blink/web_tests/virtual/legacy-client-hints-no-fp-delegation/external/wpt/client-hints/viewport-width-frame.https-expected.txt

-This is a testharness.js-based test.
-FAIL viewport-width-frame assert_equals: expected "800" but got "FAIL"
-Harness: the test ran to completion.
-

third_party/blink/web_tests/virtual/legacy-client-hints-no-fp-delegation/external/wpt/client-hints/viewport-width-iframe.https-expected.txt

-This is a testharness.js-based test.
-FAIL viewport-width-iframe assert_equals: expected "800" but got "FAIL"
-Harness: the test ran to completion.
-

third_party/blink/web_tests/virtual/legacy-client-hints-no-fp-delegation/external/wpt/client-hints/viewport-width-subresource.https-expected.txt

-This is a testharness.js-based test.
-FAIL viewport-width-subresource assert_equals: expected "503" but got "FAIL"
-Harness: the test ran to completion.
-

third_party/blink/web_tests/virtual/legacy-client-hints-no-fp-delegation/external/wpt/client-hints/viewport-width-window.https-expected.txt

-This is a testharness.js-based test.
-FAIL viewport-width-window assert_equals: expected "800" but got "FAIL"
-Harness: the test ran to completion.
-