| Index: chrome/android/javatests/src/org/chromium/chrome/browser/ntp/cards/NewTabPageRecyclerViewTest.java
|
| diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/ntp/cards/NewTabPageRecyclerViewTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/ntp/cards/NewTabPageRecyclerViewTest.java
|
| index c617ea9f962b3de7ec04279e9592290105589f07..84fe21be5b810fd546c200dd1c3b5ddcf1791350 100644
|
| --- a/chrome/android/javatests/src/org/chromium/chrome/browser/ntp/cards/NewTabPageRecyclerViewTest.java
|
| +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/ntp/cards/NewTabPageRecyclerViewTest.java
|
| @@ -75,6 +75,11 @@ protected void setUp() throws Exception {
|
| mTestServer = EmbeddedTestServer.createAndStartServer(getInstrumentation().getContext());
|
| mSiteSuggestionUrls = new String[] {mTestServer.getURL(TEST_PAGE)};
|
|
|
| + mMostVisitedSites = new FakeMostVisitedSites();
|
| + mMostVisitedSites.setTileSuggestions(FAKE_MOST_VISITED_TITLES, mSiteSuggestionUrls,
|
| + FAKE_MOST_VISITED_WHITELIST_ICON_PATHS, FAKE_MOST_VISITED_SOURCES);
|
| + TileGroupDelegateImpl.setMostVisitedSitesForTests(mMostVisitedSites);
|
| +
|
| mSource = new FakeSuggestionsSource();
|
| mSource.setInfoForCategory(TEST_CATEGORY,
|
| new SuggestionsCategoryInfo(TEST_CATEGORY, "Suggestions test title",
|
| @@ -97,22 +102,8 @@ protected void tearDown() throws Exception {
|
|
|
| @Override
|
| public void startMainActivity() throws InterruptedException {
|
| - startMainActivityOnBlankPage();
|
| + startMainActivityWithURL(UrlConstants.NTP_URL);
|
| mTab = getActivity().getActivityTab();
|
| -
|
| - ThreadUtils.runOnUiThreadBlocking(new Runnable() {
|
| - @Override
|
| - public void run() {
|
| - // Create FakeMostVisitedSites after starting the activity, since it depends on
|
| - // native code.
|
| - mMostVisitedSites = new FakeMostVisitedSites(mTab.getProfile());
|
| - mMostVisitedSites.setTileSuggestions(FAKE_MOST_VISITED_TITLES, mSiteSuggestionUrls,
|
| - FAKE_MOST_VISITED_WHITELIST_ICON_PATHS, FAKE_MOST_VISITED_SOURCES);
|
| - }
|
| - });
|
| - TileGroupDelegateImpl.setMostVisitedSitesForTests(mMostVisitedSites);
|
| -
|
| - loadUrl(UrlConstants.NTP_URL);
|
| NewTabPageTestUtils.waitForNtpLoaded(mTab);
|
|
|
| assertTrue(mTab.getNativePage() instanceof NewTabPage);
|
|
|