Exclude scrollbars from visual viewport dimensions

third_party/WebKit/LayoutTests/fast/dom/viewport/viewport-dimensions-under-browser-zoom.html

Index: third_party/WebKit/LayoutTests/fast/dom/viewport/viewport-dimensions-under-browser-zoom.html
diff --git a/third_party/WebKit/LayoutTests/fast/dom/viewport/viewport-dimensions-under-browser-zoom.html b/third_party/WebKit/LayoutTests/fast/dom/viewport/viewport-dimensions-under-browser-zoom.html
index 7b0d2130ba2c05c7c795a45562cb6c52867f9f70..89c4911366dfd27141bc9be3d7fccb0ef6851b81 100644
--- a/third_party/WebKit/LayoutTests/fast/dom/viewport/viewport-dimensions-under-browser-zoom.html
+++ b/third_party/WebKit/LayoutTests/fast/dom/viewport/viewport-dimensions-under-browser-zoom.html
@@ -4,46 +4,53 @@
     height: 2000px;
     width: 2000px;
   }
+  ::-webkit-scrollbar {
+    width: 0px;
+    height: 0px;
+  }
 </style>
 <script src="../../../resources/testharness.js"></script>
 <script src="../../../resources/testharnessreport.js"></script>
 <script>
   var browserZoomFactor = 1.25;
 
-  test(function() {
-    window.scrollTo(100, 100);
+  async_test(function(t) {
+    window.onload = t.step_func(function() {
+      window.scrollTo(100, 100);
 
-    // TODO(ymalik): Remove hook to internals to pinch-zoom here and browser
-    // zoom below. This will be required to upstream to w3c repo.
-    internals.setPageScaleFactor(2);
+      // TODO(ymalik): Remove hook to internals to pinch-zoom here and browser
+      // zoom below. This will be required to upstream to w3c repo.
+      internals.setPageScaleFactor(2);
 
-    // Offset visual viewport by 10px.
-    document.visualViewport.scrollTop = 10;
-    document.visualViewport.scrollLeft = 10;
+      // Offset visual viewport by 10px.
+      document.visualViewport.scrollTop =  10;
+      document.visualViewport.scrollLeft = 10;
 
-    assert_equals(document.visualViewport.scrollTop, 10);
-    assert_equals(document.visualViewport.scrollLeft, 10);
-    assert_equals(document.visualViewport.clientWidth, 400);
-    assert_equals(document.visualViewport.clientHeight, 300);
-    assert_equals(document.visualViewport.pageScale, 2);
+      assert_equals(document.visualViewport.scrollTop, 10);
+      assert_equals(document.visualViewport.scrollLeft, 10);
+      assert_equals(document.visualViewport.clientWidth, 400);
+      assert_equals(document.visualViewport.clientHeight, 300);
+      assert_equals(document.visualViewport.pageScale, 2);
 
-    // Apply browser zoom.
-    window.internals.setZoomFactor(browserZoomFactor);
+      // Apply browser zoom.
+      window.internals.setZoomFactor(browserZoomFactor);
 
-    // Visual viewport dimensions should be scaled by the browser zoom factor.
-    assert_equals(document.visualViewport.scrollTop, 10 / browserZoomFactor);
-    assert_equals(document.visualViewport.scrollLeft, 10 / browserZoomFactor);
-    assert_equals(document.visualViewport.clientWidth, 400 / browserZoomFactor);
-    assert_equals(document.visualViewport.clientHeight, 300 / browserZoomFactor);
-    assert_equals(document.visualViewport.pageScale, 2);
+      // Visual viewport dimensions should be scaled by the browser zoom factor.
+      assert_equals(document.visualViewport.scrollTop, 10 / browserZoomFactor);
+      assert_equals(document.visualViewport.scrollLeft, 10 / browserZoomFactor);
+      assert_equals(document.visualViewport.clientWidth, 400 / browserZoomFactor);
+      assert_equals(document.visualViewport.clientHeight, 300 / browserZoomFactor);
+      assert_equals(document.visualViewport.pageScale, 2);
 
-    // Verify setting the visual viewport offset under browser zoom.
-    document.visualViewport.scrollTop = 12.5;
-    document.visualViewport.scrollLeft = 12.5;
-    assert_equals(document.visualViewport.scrollTop, 12.5);
-    assert_equals(document.visualViewport.scrollLeft, 12.5);
-    assert_equals(document.visualViewport.clientWidth, 400 / browserZoomFactor);
-    assert_equals(document.visualViewport.clientHeight, 300 / browserZoomFactor);
-    assert_equals(document.visualViewport.pageScale, 2);
+      // Verify setting the visual viewport offset under browser zoom.
+      document.visualViewport.scrollTop = 12.5;
+      document.visualViewport.scrollLeft = 12.5;
+      assert_equals(document.visualViewport.scrollTop, 12.5);
+      assert_equals(document.visualViewport.scrollLeft, 12.5);
+      assert_equals(document.visualViewport.clientWidth, 400 / browserZoomFactor);
+      assert_equals(document.visualViewport.clientHeight, 300 / browserZoomFactor);
+      assert_equals(document.visualViewport.pageScale, 2);
+      t.done();
+    });
   }, 'Verify viewport dimensions under bowser zoom.');
 </script>