Refactor ContentViewClient (6/6)

chrome/android/javatests/src/org/chromium/chrome/browser/OSKOverscrollTest.java

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser;
 
 import android.graphics.Rect;
 import android.support.test.filters.MediumTest;
 import android.test.MoreAsserts;
+import android.widget.FrameLayout;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.base.test.util.UrlUtils;
+import org.chromium.chrome.browser.tab.TabViewAndroidDelegate;
 import org.chromium.chrome.test.ChromeActivityTestCaseBase;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
 import org.chromium.content.browser.test.util.DOMUtils;
 import org.chromium.content.browser.test.util.JavaScriptUtils;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.ui.UiUtils;
 
 import java.util.Locale;
@@ skipping 119 matching lines @@
         // position before because only the visual viewport should have resized.
         Rect footerPositionAfter = DOMUtils.getNodeBounds(webContentsRef.get(), "footer");
         assertEquals(footerPositionBefore, footerPositionAfter);
 
         CriteriaHelper.pollInstrumentationThread(new Criteria() {
             @Override
             public boolean isSatisfied() {
                 // Verify that the size of the viewport before the OSK show is equal to the size of
                 // the viewport after the OSK show plus the size of the keyboard.
                 int viewportHeightAfterCss = getViewportHeight(webContentsRef.get());
-                int keyboardHeight =
-                        viewCoreRef.get().getContentViewClient().getSystemWindowInsetBottom();
+                TabViewAndroidDelegate tvad = new TabViewAndroidDelegate(

[Ted C, 2017/04/06 19:07:55]

this doesn't seem to be in the spirit of the test.  We are creating a new object
that may or may not be sending the same values as those received by the
renderer.

I think we should expose the ViewAndroidDelegate from CVC or find some why to
query this from the view layer instead of like this (ideally, this test wouldn't
know anything about TabViewAndroidDelegate)

[Jinsuk Kim, 2017/04/06 22:08:46]

Point taken. In fact this test defeats the goal of the refactoring because I'm
trying to avoid the flow for inset value going through CVC. Though a bit higher
than view level, tapping into current tab so that we can ensure the same value
as we expect will be provided will work too, I think. PTAL.

+                        getActivity().getActivityTab(), new FrameLayout(getActivity()));
+                int keyboardHeight = tvad.getSystemWindowInsetBottom();
 
                 int priorHeight = (int) (viewportHeightBeforeCss * cssToDevicePixFactor);
                 int afterHeightPlusKeyboard =
                         (int) (viewportHeightAfterCss * cssToDevicePixFactor) + keyboardHeight;
                 updateFailureReason("Values [" + priorHeight + "], [" + afterHeightPlusKeyboard
                         + "] did not match within allowed error range [" + ERROR_EPS_PIX + "]");
                 return almostEqual(priorHeight, afterHeightPlusKeyboard);
             }
         });
     }
 }