| Index: content/browser/media/media_browsertest.cc
|
| diff --git a/content/browser/media/media_browsertest.cc b/content/browser/media/media_browsertest.cc
|
| index a0658c2448110a242aaadf609487ef8c065ea5d4..3e5a9c9823cc6c8a87f95503f92988d57283dfeb 100644
|
| --- a/content/browser/media/media_browsertest.cc
|
| +++ b/content/browser/media/media_browsertest.cc
|
| @@ -55,6 +55,7 @@ void MediaBrowserTest::RunTest(const GURL& gurl, const char* expected) {
|
| DVLOG(1) << "Running test URL: " << gurl;
|
| TitleWatcher title_watcher(shell()->web_contents(), expected_title);
|
| AddWaitForTitles(&title_watcher);
|
| + title_watcher.AlsoWaitForTitle(expected_title);
|
| NavigateToURL(shell(), gurl);
|
|
|
| base::string16 final_title = title_watcher.WaitAndGetTitle();
|
| @@ -95,6 +96,12 @@ class MediaTest : public testing::WithParamInterface<bool>,
|
| query_params.push_back(std::make_pair(tag, media_file));
|
| RunMediaTestPage("player.html", &query_params, kEnded, http);
|
| }
|
| +
|
| + void PlayVideoSize(const char* media_file, bool http, const char* expected) {
|
| + std::vector<StringPair> query_params;
|
| + query_params.push_back(std::make_pair("video", media_file));
|
| + RunMediaTestPage("player.html", &query_params, expected, http);
|
| + }
|
| };
|
|
|
| IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearTheora) {
|
| @@ -140,6 +147,22 @@ IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearMovPcmS16be) {
|
| IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearMovPcmS24be) {
|
| PlayVideo("bear_pcm_s24be.mov", GetParam());
|
| }
|
| +
|
| +IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearRotated0) {
|
| + PlayVideoSize("bear_rotate_0.mp4", GetParam(), "1280 720");
|
| +}
|
| +
|
| +IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearRotated90) {
|
| + PlayVideoSize("bear_rotate_90.mp4", GetParam(), "1280 720");
|
| +}
|
| +
|
| +IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearRotated180) {
|
| + PlayVideoSize("bear_rotate_180.mp4", GetParam(), "1280 720");
|
| +}
|
| +
|
| +IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearRotated270) {
|
| + PlayVideoSize("bear_rotate_270.mp4", GetParam(), "1280 720");
|
| +}
|
| #endif
|
|
|
| #if defined(OS_CHROMEOS)
|
|
|