[NTP] Remove the ScrollView version of the NTP.

chrome/android/javatests/src/org/chromium/chrome/browser/ntp/NewTabPageTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/ntp/NewTabPageTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/ntp/NewTabPageTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/ntp/NewTabPageTest.java
index c6a62968674ed27b62d6c229e9a5cdc74476fb13..0689c3843757f28a72ae7e91405d8cea5da83544 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/ntp/NewTabPageTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/ntp/NewTabPageTest.java
@@ -122,8 +122,7 @@ public class NewTabPageTest extends ChromeTabbedActivityTestBase {
         viewRenderer.renderAndCompare(mNtp.getView().getRootView(), "new_tab_page");
 
         // Scroll to search bar
-        final NewTabPageRecyclerView recyclerView =
-                (NewTabPageRecyclerView) mNtp.getNewTabPageView().getWrapperView();
+        final NewTabPageRecyclerView recyclerView = mNtp.getNewTabPageView().getRecyclerView();
 
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
@@ -151,8 +150,7 @@ public class NewTabPageTest extends ChromeTabbedActivityTestBase {
         assertFalse(mNtp.shouldCaptureThumbnail());
 
         // Check that we invalidate the thumbnail when the Recycler View is updated.
-        NewTabPageRecyclerView recyclerView =
-                (NewTabPageRecyclerView) mNtp.getNewTabPageView().getWrapperView();
+        NewTabPageRecyclerView recyclerView = mNtp.getNewTabPageView().getRecyclerView();
 
         recyclerView.getAdapter().notifyDataSetChanged();
         assertThumbnailInvalidAndRecapture();