Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(182)

Unified Diff: content/browser/media/media_source_browsertest.cc

Issue 408993002: Have media content and chrome browser tests load data from media/test/data (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/media/media_browsertest.cc ('k') | content/test/data/media/blackwhite.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/media/media_source_browsertest.cc
diff --git a/content/browser/media/media_source_browsertest.cc b/content/browser/media/media_source_browsertest.cc
index d5d86154637056c7242f684dbd2087d8372ac66d..90d0c84219fdb5774774c2a29656e3e62833809b 100644
--- a/content/browser/media/media_source_browsertest.cc
+++ b/content/browser/media/media_source_browsertest.cc
@@ -32,17 +32,18 @@ static bool IsMSESupported() {
class MediaSourceTest : public content::MediaBrowserTest {
public:
- void TestSimplePlayback(const char* media_file, const char* media_type,
- const char* expectation) {
+ void TestSimplePlayback(const std::string& media_file,
+ const std::string& media_type,
+ const std::string& expectation) {
if (!IsMSESupported()) {
VLOG(0) << "Skipping test - MSE not supported.";
return;
}
- std::vector<StringPair> query_params;
- query_params.push_back(std::make_pair("mediafile", media_file));
- query_params.push_back(std::make_pair("mediatype", media_type));
- RunMediaTestPage("media_source_player.html", &query_params, expectation,
+ media::QueryParams query_params;
+ query_params.push_back(std::make_pair("mediaFile", media_file));
+ query_params.push_back(std::make_pair("mediaType", media_type));
+ RunMediaTestPage("media_source_player.html", query_params, expectation,
true);
}
@@ -84,7 +85,10 @@ IN_PROC_BROWSER_TEST_F(MediaSourceTest, ConfigChangeVideo) {
VLOG(0) << "Skipping test - MSE not supported.";
return;
}
- RunMediaTestPage("mse_config_change.html", NULL, kEnded, true);
+ RunMediaTestPage("mse_config_change.html",
+ media::QueryParams(),
+ kEnded,
+ true);
}
} // namespace content
« no previous file with comments | « content/browser/media/media_browsertest.cc ('k') | content/test/data/media/blackwhite.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698