0

[MediaSession, Test] Move MediaSession test data to all-platforms directory

Since MediaSession is no longer Android-only, this CL moves the test
data out from the android/ test directory.

BUG=587471

Review URL: https://codereview.chromium.org/1862203003

Cr-Commit-Position: refs/heads/master@{#386056}
This commit is contained in:
zqzhang
2016-04-08 05:44:41 -07:00
committed by Commit bot
parent 5370ba54d2
commit 01e0dea8ec
13 changed files with 5 additions and 4 deletions

@ -28,7 +28,7 @@ import java.util.concurrent.TimeoutException;
@CommandLineFlags.Add(ContentSwitches.DISABLE_GESTURE_REQUIREMENT_FOR_MEDIA_PLAYBACK)
public class PauseOnHeadsetUnplugTest extends ChromeActivityTestCaseBase<ChromeActivity> {
private static final String TEST_PATH =
"/content/test/data/android/media/media-session.html";
"/content/test/data/media/session/media-session.html";
private static final String VIDEO_ID = "long-video";
private EmbeddedTestServer mTestServer;

@ -21,8 +21,8 @@
'<(DEPTH)/chrome/test/data/webapps/',
'<(DEPTH)/chrome/test/media_router/resources/',
'<(DEPTH)/content/test/data/android/geolocation.html',
'<(DEPTH)/content/test/data/android/media/',
'<(DEPTH)/content/test/data/media/getusermedia.html',
'<(DEPTH)/content/test/data/media/session/',
'<(DEPTH)/content/test/data/media/webrtc_test_utilities.js',
],
},

@ -70,7 +70,7 @@ class MediaSessionVisibilityBrowserTest
void LoadTestPage() {
TestNavigationObserver navigation_observer(shell()->web_contents(), 1);
shell()->LoadURL(GetTestUrl("android/media", "media-session.html"));
shell()->LoadURL(GetTestUrl("media/session", "media-session.html"));
navigation_observer.Wait();
}

@ -7,6 +7,7 @@
'variables': {
'files': [
'<(DEPTH)/content/test/data/android/',
'<(DEPTH)/content/test/data/media/session/',
'<(DEPTH)/net/data/ssl/certificates/crit-codeSigning-chain.pem',
'<(DEPTH)/net/data/ssl/certificates/eku-test-root.pem',
'<(DEPTH)/net/data/ssl/certificates/invalid_key_usage_cert.der',

@ -26,7 +26,7 @@ import java.util.concurrent.Callable;
@CommandLineFlags.Add(ContentSwitches.DISABLE_GESTURE_REQUIREMENT_FOR_MEDIA_PLAYBACK)
public class MediaSessionTest extends ContentShellTestBase {
private static final String MEDIA_SESSION_TEST_URL =
"content/test/data/android/media/media-session.html";
"content/test/data/media/session/media-session.html";
private static final String VERY_SHORT_AUDIO = "very-short-audio";
private static final String SHORT_AUDIO = "short-audio";
private static final String LONG_AUDIO = "long-audio";