Set the parent viewport on the NewTabPageScroll

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

Index: chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageScrollView.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageScrollView.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageScrollView.java
index 2f9715d166313872f53b03de4a434ff57c64dc66..878742234310b88ce9b46c84e763127d9b3b4cc3 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageScrollView.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageScrollView.java
@@ -42,6 +42,8 @@ public class NewTabPageScrollView extends ScrollView {
     private GestureDetector mGestureDetector;
     private OnScrollListener mOnScrollListener;
 
+    private NewTabPageLayout mNewTabPageLayout;
+
     private FadingShadow mFadingShadow;
 
     /**
@@ -75,6 +77,22 @@ public class NewTabPageScrollView extends ScrollView {
     }
 
     @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);
         return super.onInterceptTouchEvent(ev);