Set the parent viewport on the NewTabPageScroll

Introduced a bug on new tab page scroll where on measure is slightly different when recycler view is enabled. Reverting this change and cleaning it up slightly

BUG=610262

Review-Url: https://codereview.chromium.org/1965363002
Cr-Commit-Position: refs/heads/master@{#392953}

chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageScrollView.java

@@ -42,6 +42,8 @@ public interface OnScrollListener {
     private GestureDetector mGestureDetector;
     private OnScrollListener mOnScrollListener;
 
+    private NewTabPageLayout mNewTabPageLayout;
+
     private FadingShadow mFadingShadow;
 
     /**
@@ -74,6 +76,22 @@ public void enableBottomShadow(int shadowColor) {
         setFadingEdgeLength(getResources().getDimensionPixelSize(R.dimen.ntp_shadow_height));
     }
 
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+
+        // Incognito also uses this scroll view but will not have the id so will return null.
+        mNewTabPageLayout = (NewTabPageLayout) findViewById(R.id.ntp_content);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        if (mNewTabPageLayout != null) {
+            mNewTabPageLayout.setParentScrollViewportHeight(MeasureSpec.getSize(heightMeasureSpec));
+        }
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+    }
+
     @Override
     public boolean onInterceptTouchEvent(MotionEvent ev) {
         mGestureDetector.onTouchEvent(ev);