OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/command_line.h" | 5 #include "base/command_line.h" |
6 #include "content/browser/media/media_browsertest.h" | 6 #include "content/browser/media/media_browsertest.h" |
7 #include "content/public/common/content_switches.h" | 7 #include "content/public/common/content_switches.h" |
8 #if defined(OS_ANDROID) | 8 #if defined(OS_ANDROID) |
9 #include "base/android/build_info.h" | 9 #include "base/android/build_info.h" |
10 #endif | 10 #endif |
(...skipping 28 matching lines...) Expand all Loading... |
39 VLOG(0) << "Skipping test - MSE not supported."; | 39 VLOG(0) << "Skipping test - MSE not supported."; |
40 return; | 40 return; |
41 } | 41 } |
42 | 42 |
43 media::QueryParams query_params; | 43 media::QueryParams query_params; |
44 query_params.push_back(std::make_pair("mediaFile", media_file)); | 44 query_params.push_back(std::make_pair("mediaFile", media_file)); |
45 query_params.push_back(std::make_pair("mediaType", media_type)); | 45 query_params.push_back(std::make_pair("mediaType", media_type)); |
46 RunMediaTestPage("media_source_player.html", query_params, expectation, | 46 RunMediaTestPage("media_source_player.html", query_params, expectation, |
47 true); | 47 true); |
48 } | 48 } |
| 49 |
| 50 #if defined(OS_ANDROID) |
| 51 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { |
| 52 command_line->AppendSwitch( |
| 53 switches::kDisableGestureRequirementForMediaPlayback); |
| 54 } |
| 55 #endif |
49 }; | 56 }; |
50 | 57 |
51 IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_VideoAudio_WebM) { | 58 IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_VideoAudio_WebM) { |
52 TestSimplePlayback("bear-320x240.webm", kWebMAudioVideo, kEnded); | 59 TestSimplePlayback("bear-320x240.webm", kWebMAudioVideo, kEnded); |
53 } | 60 } |
54 | 61 |
55 IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_VideoOnly_WebM) { | 62 IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_VideoOnly_WebM) { |
56 TestSimplePlayback("bear-320x240-video-only.webm", kWebMVideoOnly, kEnded); | 63 TestSimplePlayback("bear-320x240-video-only.webm", kWebMVideoOnly, kEnded); |
57 } | 64 } |
58 | 65 |
(...skipping 19 matching lines...) Expand all Loading... |
78 VLOG(0) << "Skipping test - MSE not supported."; | 85 VLOG(0) << "Skipping test - MSE not supported."; |
79 return; | 86 return; |
80 } | 87 } |
81 RunMediaTestPage("mse_config_change.html", | 88 RunMediaTestPage("mse_config_change.html", |
82 media::QueryParams(), | 89 media::QueryParams(), |
83 kEnded, | 90 kEnded, |
84 true); | 91 true); |
85 } | 92 } |
86 | 93 |
87 } // namespace content | 94 } // namespace content |
OLD | NEW |