Fix VR URL failures

Fixes several failing VR tests caused by the expected URL being slightly
different from the actual URL.

TBR=billorr@chromium.org

Bug: 894796
Change-Id: Ibf01674f6694dc441bd0fb8ffaea151adce7fc47
Reviewed-on: https://chromium-review.googlesource.com/c/1343248Reviewed-by: Brian Sheedy <bsheedy@chromium.org>
Commit-Queue: Brian Sheedy <bsheedy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#609439}

chrome/android/javatests/src/org/chromium/chrome/browser/vr/VrBrowserControllerInputTest.java

@@ -24,6 +24,7 @@ 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.UrlConstants;
 import org.chromium.chrome.browser.history.HistoryPage;
 import org.chromium.chrome.browser.vr.rules.ChromeTabbedActivityVrTestRule;
 import org.chromium.chrome.browser.vr.util.NativeUiUtils;
@@ -299,7 +300,7 @@ public class VrBrowserControllerInputTest {
         mVrTestRule.loadUrl(VrBrowserTestFramework.getFileUrlForHtmlTestFile("test_gamepad_button"),
                 PAGE_LOAD_TIMEOUT_S);
 
-        mVrTestRule.loadUrl("chrome://history", PAGE_LOAD_TIMEOUT_S);
+        mVrTestRule.loadUrl(UrlConstants.HISTORY_URL, PAGE_LOAD_TIMEOUT_S);
 
         RecyclerView recyclerView =
                 ((HistoryPage) (mVrTestRule.getActivity().getActivityTab().getNativePage()))

chrome/android/javatests/src/org/chromium/chrome/browser/vr/XrTestFramework.java

@@ -59,7 +59,10 @@ public abstract class XrTestFramework {
     public static final int POLL_TIMEOUT_SHORT_MS = 1000;
     public static final int POLL_TIMEOUT_LONG_MS = 10000;
 
-    public static final String[] NATIVE_URLS_OF_INTEREST = {UrlConstants.BOOKMARKS_FOLDER_URL,
+    // The "3" corresponds to the "Mobile Bookmarks" folder - omitting a particular folder
+    // automatically redirects to that folder, and not having it in the URL causes issues with the
+    // URL we expect to be loaded being different than the actual URL.
+    public static final String[] NATIVE_URLS_OF_INTEREST = {UrlConstants.BOOKMARKS_FOLDER_URL + "3",
             UrlConstants.BOOKMARKS_UNCATEGORIZED_URL, UrlConstants.BOOKMARKS_URL,
             UrlConstants.DOWNLOADS_URL, UrlConstants.NATIVE_HISTORY_URL, UrlConstants.NTP_URL,
             UrlConstants.RECENT_TABS_URL};