Create Java infrastructure for UI Render Tests.

chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/NewTabPageAdapter.java

Index: chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/NewTabPageAdapter.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/NewTabPageAdapter.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/NewTabPageAdapter.java
index 217949aa121b78293dc4e0111fbf2811855e41e9..d0e8ca75cfe5adc93c99261631bb0eae76b0e0d3 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/NewTabPageAdapter.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/NewTabPageAdapter.java
@@ -9,11 +9,11 @@ import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.RecyclerView.Adapter;
 import android.support.v7.widget.RecyclerView.ViewHolder;
 import android.support.v7.widget.helper.ItemTouchHelper;
+import android.view.View;
 import android.view.ViewGroup;
 
 import org.chromium.base.Callback;
 import org.chromium.base.Log;
-import org.chromium.chrome.browser.ntp.NewTabPageLayout;
 import org.chromium.chrome.browser.ntp.NewTabPageUma;
 import org.chromium.chrome.browser.ntp.NewTabPageView.NewTabPageManager;
 import org.chromium.chrome.browser.ntp.snippets.DisabledReason;
@@ -22,7 +22,8 @@ import org.chromium.chrome.browser.ntp.snippets.SnippetArticleViewHolder;
 import org.chromium.chrome.browser.ntp.snippets.SnippetHeaderListItem;
 import org.chromium.chrome.browser.ntp.snippets.SnippetHeaderViewHolder;
 import org.chromium.chrome.browser.ntp.snippets.SnippetsBridge;
-import org.chromium.chrome.browser.ntp.snippets.SnippetsBridge.SnippetsObserver;
+import org.chromium.chrome.browser.ntp.snippets.SnippetsSource;
+import org.chromium.chrome.browser.ntp.snippets.SnippetsSource.SnippetsObserver;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -43,7 +44,7 @@ public class NewTabPageAdapter extends Adapter<NewTabPageViewHolder> implements
     private static final int FIRST_CARD_POSITION = 2;
 
     private final NewTabPageManager mNewTabPageManager;
-    private final NewTabPageLayout mNewTabPageLayout;
+    private final View mAboveTheFoldView;
     private final AboveTheFoldListItem mAboveTheFoldListItem;
     private final SnippetHeaderListItem mHeaderListItem;
     private StatusListItem mStatusListItem;
@@ -52,7 +53,7 @@ public class NewTabPageAdapter extends Adapter<NewTabPageViewHolder> implements
     private NewTabPageRecyclerView mRecyclerView;
     private boolean mWantsSnippets;
 
-    private SnippetsBridge mSnippetsBridge;
+    private SnippetsSource mSnippetsSource;
 
     private class ItemTouchCallbacks extends ItemTouchHelper.Callback {
         @Override
@@ -111,20 +112,20 @@ public class NewTabPageAdapter extends Adapter<NewTabPageViewHolder> implements
      *                         (logo, search box, most visited tiles)
      * @param snippetsBridge the bridge to interact with the snippets service.
      */
-    public NewTabPageAdapter(NewTabPageManager manager, NewTabPageLayout newTabPageLayout,
-            SnippetsBridge snippetsBridge) {
+    public NewTabPageAdapter(NewTabPageManager manager, View aboveTheFoldView,
+            SnippetsSource snippetsBridge) {
         mNewTabPageManager = manager;
-        mNewTabPageLayout = newTabPageLayout;
+        mAboveTheFoldView = aboveTheFoldView;
         mAboveTheFoldListItem = new AboveTheFoldListItem();
         mHeaderListItem = new SnippetHeaderListItem();
         mItemTouchCallbacks = new ItemTouchCallbacks();
         mNewTabPageListItems = new ArrayList<NewTabPageListItem>();
         mWantsSnippets = true;
-        mSnippetsBridge = snippetsBridge;
-        mStatusListItem = StatusListItem.create(snippetsBridge.getDisabledReason(), this, manager);
+        mSnippetsSource = snippetsBridge;
+        mStatusListItem = StatusListItem.create(mSnippetsSource.getDisabledReason(), this, manager);
 
         loadSnippets(new ArrayList<SnippetArticle>());
-        mSnippetsBridge.setObserver(this);
+        mSnippetsSource.setObserver(this);
     }
 
     /** Returns callbacks to configure the interactions with the RecyclerView's items. */
@@ -179,7 +180,7 @@ public class NewTabPageAdapter extends Adapter<NewTabPageViewHolder> implements
         assert parent == mRecyclerView;
 
         if (viewType == NewTabPageListItem.VIEW_TYPE_ABOVE_THE_FOLD) {
-            return new NewTabPageViewHolder(mNewTabPageLayout);
+            return new NewTabPageViewHolder(mAboveTheFoldView);
         }
 
         if (viewType == NewTabPageListItem.VIEW_TYPE_HEADER) {
@@ -187,7 +188,7 @@ public class NewTabPageAdapter extends Adapter<NewTabPageViewHolder> implements
         }
 
         if (viewType == NewTabPageListItem.VIEW_TYPE_SNIPPET) {
-            return new SnippetArticleViewHolder(mRecyclerView, mNewTabPageManager, mSnippetsBridge);
+            return new SnippetArticleViewHolder(mRecyclerView, mNewTabPageManager, mSnippetsSource);
         }
 
         if (viewType == NewTabPageListItem.VIEW_TYPE_SPACING) {
@@ -266,7 +267,7 @@ public class NewTabPageAdapter extends Adapter<NewTabPageViewHolder> implements
         int position = itemViewHolder.getAdapterPosition();
         SnippetArticle dismissedSnippet = (SnippetArticle) mNewTabPageListItems.get(position);
 
-        mSnippetsBridge.getSnippedVisited(dismissedSnippet, new Callback<Boolean>() {
+        mSnippetsSource.getSnippedVisited(dismissedSnippet, new Callback<Boolean>() {
             @Override
             public void onResult(Boolean result) {
                 NewTabPageUma.recordSnippetAction(result
@@ -275,7 +276,7 @@ public class NewTabPageAdapter extends Adapter<NewTabPageViewHolder> implements
             }
         });
 
-        mSnippetsBridge.discardSnippet(dismissedSnippet);
+        mSnippetsSource.discardSnippet(dismissedSnippet);
         mNewTabPageListItems.remove(position);
         notifyItemRemoved(position);
     }