Refactor ContentViewClient (6/6)

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

Index: chrome/android/javatests/src/org/chromium/chrome/browser/OSKOverscrollTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/OSKOverscrollTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/OSKOverscrollTest.java
index 5192e81431014153c4aa3eaa42d5d83a08ee9d6b..1307b83b72cdb7c7fcd57982cad4eee16ac5c570 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/OSKOverscrollTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/OSKOverscrollTest.java
@@ -7,11 +7,13 @@ 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;
@@ -151,8 +153,9 @@ public class OSKOverscrollTest extends ChromeActivityTestCaseBase<ChromeActivity
                 // 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 =