Rename MostVisited ui bits to Tile(Grid).

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.ntp;
 
 import android.graphics.Canvas;
 import android.support.test.filters.LargeTest;
 import android.support.test.filters.MediumTest;
 import android.support.test.filters.SmallTest;
@@ skipping 45 matching lines @@
 
     private static final String TEST_PAGE = "/chrome/test/data/android/navigate/simple.html";
 
     private static final String[] FAKE_MOST_VISITED_TITLES = new String[] { "Simple" };
     private static final String[] FAKE_MOST_VISITED_WHITELIST_ICON_PATHS = new String[] { "" };
     private static final int[] FAKE_MOST_VISITED_SOURCES = new int[] {NTPTileSource.TOP_SITES};
 
     private Tab mTab;
     private NewTabPage mNtp;
     private View mFakebox;
-    private ViewGroup mMostVisitedLayout;
+    private ViewGroup mTileGridLayout;
     private String[] mFakeMostVisitedUrls;
     private FakeMostVisitedSites mFakeMostVisitedSites;
     private EmbeddedTestServer mTestServer;
 
     @Override
     protected void setUp() throws Exception {
         mTestServer = EmbeddedTestServer.createAndStartServer(getInstrumentation().getContext());
         mFakeMostVisitedUrls = new String[] {mTestServer.getURL(TEST_PAGE)};
         super.setUp();
     }
@@ skipping 24 matching lines @@
             fail(t.getMessage());
         }
         TileGroupDelegateImpl.setMostVisitedSitesForTests(mFakeMostVisitedSites);
 
         loadUrl(UrlConstants.NTP_URL);
         NewTabPageTestUtils.waitForNtpLoaded(mTab);
 
         assertTrue(mTab.getNativePage() instanceof NewTabPage);
         mNtp = (NewTabPage) mTab.getNativePage();
         mFakebox = mNtp.getView().findViewById(R.id.search_box);
-        mMostVisitedLayout = (ViewGroup) mNtp.getView().findViewById(R.id.most_visited_layout);
-        assertEquals(mFakeMostVisitedUrls.length, mMostVisitedLayout.getChildCount());
+        mTileGridLayout = (ViewGroup) mNtp.getView().findViewById(R.id.tile_grid_layout);
+        assertEquals(mFakeMostVisitedUrls.length, mTileGridLayout.getChildCount());
     }
 
     @MediumTest
     @Feature({"NewTabPage", "RenderTest"})
     @CommandLineFlags.Add("enable-features=NTPSnippets")
     public void testRender() throws IOException {
         ViewRenderer viewRenderer = new ViewRenderer(getActivity(),
                 "chrome/test/data/android/render_tests", "NewTabPageTest");
-        viewRenderer.renderAndCompare(mMostVisitedLayout, "most_visited");
+        viewRenderer.renderAndCompare(mTileGridLayout, "most_visited");
         viewRenderer.renderAndCompare(mFakebox, "fakebox");
         viewRenderer.renderAndCompare(mNtp.getView().getRootView(), "new_tab_page");
 
         // Scroll to search bar
         final NewTabPageRecyclerView recyclerView = mNtp.getNewTabPageView().getRecyclerView();
 
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 recyclerView.smoothScrollBy(0, mFakebox.getTop());
@@ skipping 95 matching lines @@
 
     /**
      * Tests clicking on a most visited item.
      */
     @SmallTest
     @Feature({"NewTabPage"})
     public void testClickMostVisitedItem() throws InterruptedException {
         ChromeTabUtils.waitForTabPageLoaded(mTab, new Runnable() {
             @Override
             public void run() {
-                View mostVisitedItem = mMostVisitedLayout.getChildAt(0);
+                View mostVisitedItem = mTileGridLayout.getChildAt(0);
                 singleClickView(mostVisitedItem);
             }
         });
         assertEquals(mFakeMostVisitedUrls[0], mTab.getUrl());
     }
 
     /**
      * Tests opening a most visited item in a new tab.
      */
     @DisabledTest // Flaked on the try bot. http://crbug.com/543138
     @SmallTest
     @Feature({"NewTabPage"})
     public void testOpenMostVisitedItemInNewTab() throws InterruptedException {
-        invokeContextMenuAndOpenInANewTab(mMostVisitedLayout.getChildAt(0),
+        invokeContextMenuAndOpenInANewTab(mTileGridLayout.getChildAt(0),
                 ContextMenuManager.ID_OPEN_IN_NEW_TAB, false, mFakeMostVisitedUrls[0]);
     }
 
     /**
      * Tests opening a most visited item in a new incognito tab.
      */
     @SmallTest
     @Feature({"NewTabPage"})
     public void testOpenMostVisitedItemInIncognitoTab() throws InterruptedException {
-        invokeContextMenuAndOpenInANewTab(mMostVisitedLayout.getChildAt(0),
+        invokeContextMenuAndOpenInANewTab(mTileGridLayout.getChildAt(0),
                 ContextMenuManager.ID_OPEN_IN_INCOGNITO_TAB, true, mFakeMostVisitedUrls[0]);
     }
 
     /**
      * Tests deleting a most visited item.
      */
     @SmallTest
     @Feature({"NewTabPage"})
     public void testRemoveMostVisitedItem() {
-        View mostVisitedItem = mMostVisitedLayout.getChildAt(0);
+        View mostVisitedItem = mTileGridLayout.getChildAt(0);
         ArrayList<View> views = new ArrayList<>();
-        mMostVisitedLayout.findViewsWithText(views, FAKE_MOST_VISITED_TITLES[0],
-                View.FIND_VIEWS_WITH_TEXT);
+        mTileGridLayout.findViewsWithText(
+                views, FAKE_MOST_VISITED_TITLES[0], View.FIND_VIEWS_WITH_TEXT);
         assertEquals(1, views.size());
 
         TestTouchUtils.longClickView(getInstrumentation(), mostVisitedItem);
         assertTrue(getInstrumentation().invokeContextMenuAction(
                 getActivity(), ContextMenuManager.ID_REMOVE, 0));
 
         assertTrue(mFakeMostVisitedSites.isUrlBlacklisted(mFakeMostVisitedUrls[0]));
     }
 
     @MediumTest
@@ skipping 174 matching lines @@
      */
     private void waitForFakeboxTopPosition(final NewTabPage ntp, int position) {
         CriteriaHelper.pollUiThread(Criteria.equals(position, new Callable<Integer>() {
             @Override
             public Integer call() {
                 return getFakeboxTop(ntp);
             }
         }));
     }
 }