| Index: chrome/android/javatests/src/org/chromium/chrome/browser/media/ui/NotificationActionsUpdatedTest.java
|
| diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/media/ui/NotificationActionsUpdatedTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/media/ui/NotificationActionsUpdatedTest.java
|
| index 105203e8c9beb597d0d43b9dc36ed4ff6bc67f54..d5d883595203fa50b4fe5634f18d79ee1f293206 100644
|
| --- a/chrome/android/javatests/src/org/chromium/chrome/browser/media/ui/NotificationActionsUpdatedTest.java
|
| +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/media/ui/NotificationActionsUpdatedTest.java
|
| @@ -15,6 +15,7 @@ import org.chromium.chrome.browser.tab.Tab;
|
| import org.chromium.chrome.test.ChromeActivityTestCaseBase;
|
| import org.chromium.content.browser.test.util.Criteria;
|
| import org.chromium.content.browser.test.util.CriteriaHelper;
|
| +import org.chromium.content_public.browser.LoadUrlParams;
|
| import org.chromium.content_public.browser.MediaSession;
|
| import org.chromium.content_public.browser.MediaSessionObserver;
|
| import org.chromium.net.test.EmbeddedTestServer;
|
| @@ -28,7 +29,7 @@ import java.util.Set;
|
| */
|
| public class NotificationActionsUpdatedTest extends ChromeActivityTestCaseBase<ChromeActivity> {
|
| private static final int NOTIFICATION_ID = R.id.media_playback_notification;
|
| - private static final String SIMPLE_PAGE_URL = "/simple_page.html";
|
| + private static final String SIMPLE_PAGE_URL = "/content/test/data/simple_page.html";
|
|
|
| private Tab mTab;
|
| private EmbeddedTestServer mTestServer;
|
| @@ -82,7 +83,7 @@ public class NotificationActionsUpdatedTest extends ChromeActivityTestCaseBase<C
|
| simulateMediaSessionStateChanged(mTab, true, false);
|
| assertActionsMatch(buildActions());
|
|
|
| - loadUrl(mTestServer.getURL(SIMPLE_PAGE_URL + "#some-anchor"));
|
| + simulateInPageNavigation(mTab, mTestServer.getURL(SIMPLE_PAGE_URL));
|
| assertActionsMatch(buildActions());
|
| }
|
|
|
| @@ -144,6 +145,16 @@ public class NotificationActionsUpdatedTest extends ChromeActivityTestCaseBase<C
|
| });
|
| }
|
|
|
| + private void simulateInPageNavigation(final Tab tab, final String url) {
|
| + ThreadUtils.runOnUiThreadBlocking(new Runnable() {
|
| + @Override
|
| + public void run() {
|
| + tab.loadUrl(new LoadUrlParams(url + "#some-anchor"));
|
| + }
|
| + });
|
| + getInstrumentation().waitForIdleSync();
|
| + }
|
| +
|
| private void ensureTestServer() {
|
| try {
|
| mTestServer = EmbeddedTestServer.createAndStartServer(
|
|
|