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 22 matching lines...) Expand all Loading... |
33 class MediaSourceTest : public content::MediaBrowserTest { | 33 class MediaSourceTest : public content::MediaBrowserTest { |
34 public: | 34 public: |
35 void TestSimplePlayback(const std::string& media_file, | 35 void TestSimplePlayback(const std::string& media_file, |
36 const std::string& media_type, | 36 const std::string& media_type, |
37 const std::string& expectation) { | 37 const std::string& expectation) { |
38 if (!IsMSESupported()) { | 38 if (!IsMSESupported()) { |
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 base::StringPairs 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 | 49 |
50 #if defined(OS_ANDROID) | 50 #if defined(OS_ANDROID) |
51 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { | 51 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { |
52 command_line->AppendSwitch( | 52 command_line->AppendSwitch( |
53 switches::kDisableGestureRequirementForMediaPlayback); | 53 switches::kDisableGestureRequirementForMediaPlayback); |
(...skipping 25 matching lines...) Expand all Loading... |
79 } | 79 } |
80 | 80 |
81 // Flaky test crbug.com/246308 | 81 // Flaky test crbug.com/246308 |
82 // Test changed to skip checks resulting in flakiness. Proper fix still needed. | 82 // Test changed to skip checks resulting in flakiness. Proper fix still needed. |
83 IN_PROC_BROWSER_TEST_F(MediaSourceTest, ConfigChangeVideo) { | 83 IN_PROC_BROWSER_TEST_F(MediaSourceTest, ConfigChangeVideo) { |
84 if (!IsMSESupported()) { | 84 if (!IsMSESupported()) { |
85 VLOG(0) << "Skipping test - MSE not supported."; | 85 VLOG(0) << "Skipping test - MSE not supported."; |
86 return; | 86 return; |
87 } | 87 } |
88 RunMediaTestPage("mse_config_change.html", | 88 RunMediaTestPage("mse_config_change.html", |
89 media::QueryParams(), | 89 base::StringPairs(), |
90 kEnded, | 90 kEnded, |
91 true); | 91 true); |
92 } | 92 } |
93 | 93 |
94 } // namespace content | 94 } // namespace content |
OLD | NEW |