Add history testing code to VR navigation test

Checks browser history after navigating to two pages in the VR browser. Both
the VR browser and regular "2D" Chrome are supposed to share history, which
up until now was only tested manually.

Bug: 728779
Change-Id: I48b3c075e9a043c9a2fadb67e71e9080cb9f7e9b
Reviewed-on: https://chromium-review.googlesource.com/570120
Commit-Queue: Brian Sheedy <bsheedy@chromium.org>
Reviewed-by: Tommy Nyquist <nyquist@chromium.org>
Reviewed-by: Michael Thiessen <mthiesse@chromium.org>
Reviewed-by: Theresa <twellington@chromium.org>
Reviewed-by: David Trainor <dtrainor@chromium.org>
Cr-Commit-Position: refs/heads/master@{#487209}

chrome/android/BUILD.gn

@@ -589,6 +589,7 @@ if (enable_vr) {
       "//third_party/android_support_test_runner:rules_java",
       "//third_party/android_support_test_runner:runner_java",
       "//third_party/android_tools:android_support_v7_appcompat_java",
+      "//third_party/android_tools:android_support_v7_recyclerview_java",
       "//third_party/gvr-android-sdk:controller_test_api_java",
       "//third_party/gvr-android-sdk:gvr_common_java",
       "//third_party/junit",

chrome/android/java/src/org/chromium/chrome/browser/history/HistoryAdapter.java

@@ -444,4 +444,9 @@ public class HistoryAdapter extends DateDividedAdapter implements BrowsingHistor
     ViewGroup getPrivacyDisclaimersForTests() {
         return mPrivacyDisclaimers;
     }
+
+    @VisibleForTesting
+    public ArrayList<HistoryItemView> getItemViewsForTests() {
+        return mItemViews;
+    }
 }

chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManager.java

@@ -381,7 +381,7 @@ public class HistoryManager implements OnMenuItemClickListener, SignInStateObser
     }
 
     @VisibleForTesting
-    HistoryAdapter getAdapterForTests() {
+    public HistoryAdapter getAdapterForTests() {
         return mHistoryAdapter;
     }
 

chrome/android/java/src/org/chromium/chrome/browser/history/HistoryPage.java

@@ -8,6 +8,7 @@ import android.app.Activity;
 import android.view.View;
 
 import org.chromium.base.ApiCompatibilityUtils;
+import org.chromium.base.VisibleForTesting;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.BasicNativePage;
 import org.chromium.chrome.browser.NativePageHost;
@@ -69,4 +70,9 @@ public class HistoryPage extends BasicNativePage {
     public int getThemeColor() {
         return mThemeColor;
     }
+
+    @VisibleForTesting
+    public HistoryManager getHistoryManagerForTesting() {
+        return mHistoryManager;
+    }
 }

chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/VrShellNavigationTest.java

@@ -21,6 +21,8 @@ import org.junit.runner.RunWith;
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.Restriction;
 import org.chromium.chrome.browser.ChromeSwitches;
+import org.chromium.chrome.browser.history.HistoryItemView;
+import org.chromium.chrome.browser.history.HistoryPage;
 import org.chromium.chrome.browser.vr_shell.util.VrInfoBarUtils;
 import org.chromium.chrome.browser.vr_shell.util.VrTransitionUtils;
 import org.chromium.chrome.test.ChromeActivityTestCaseBase;
@@ -31,6 +33,7 @@ import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content.browser.test.util.DOMUtils;
 import org.chromium.content_public.browser.WebContents;
 
+import java.util.ArrayList;
 import java.util.concurrent.TimeoutException;
 
 /**
@@ -110,7 +113,8 @@ public class VrShellNavigationTest {
     }
 
     /**
-     * Tests navigation from a 2D to a 2D page.
+     * Tests navigation from a 2D to a 2D page. Also tests that this navigation is
+     * properly added to Chrome's history.
      */
     @Test
     @MediumTest
@@ -121,6 +125,22 @@ public class VrShellNavigationTest {
 
         assertState(mVrTestRule.getFirstTabWebContents(), Page.PAGE_2D,
                 PresentationMode.NON_PRESENTING, FullscreenMode.NON_FULLSCREENED);
+
+        // Test that the navigations were added to history
+        VrTransitionUtils.forceExitVr();
+        mVrTestRule.loadUrl("chrome://history", PAGE_LOAD_TIMEOUT_S);
+        HistoryPage historyPage =
+                (HistoryPage) mVrTestRule.getActivity().getActivityTab().getNativePage();
+        ArrayList<HistoryItemView> itemViews = historyPage.getHistoryManagerForTesting()
+                                                       .getAdapterForTests()
+                                                       .getItemViewsForTests();
+        Assert.assertEquals("Two navigations showed up in history", 2, itemViews.size());
+        // History is in reverse chronological order, so the first navigation should actually be
+        // after the second in the list
+        Assert.assertEquals("First navigation is correct", TEST_PAGE_2D_URL,
+                itemViews.get(1).getItem().getUrl());
+        Assert.assertEquals("Second navigation is correct", getUrl(Page.PAGE_2D),
+                itemViews.get(0).getItem().getUrl());
     }
 
     /**