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 "base/strings/utf_string_conversions.h" | 6 #include "base/strings/utf_string_conversions.h" |
7 #include "base/win/windows_version.h" | 7 #include "base/win/windows_version.h" |
8 #include "content/browser/media/media_browsertest.h" | 8 #include "content/browser/media/media_browsertest.h" |
9 #include "content/public/common/content_switches.h" | 9 #include "content/public/common/content_switches.h" |
10 #include "content/public/test/browser_test_utils.h" | 10 #include "content/public/test/browser_test_utils.h" |
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
122 | 122 |
123 protected: | 123 protected: |
124 // We want to fail quickly when a test fails because an error is encountered. | 124 // We want to fail quickly when a test fails because an error is encountered. |
125 void AddWaitForTitles(content::TitleWatcher* title_watcher) override { | 125 void AddWaitForTitles(content::TitleWatcher* title_watcher) override { |
126 MediaBrowserTest::AddWaitForTitles(title_watcher); | 126 MediaBrowserTest::AddWaitForTitles(title_watcher); |
127 title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kEmeNotSupportedError)); | 127 title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kEmeNotSupportedError)); |
128 title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kEmeKeyError)); | 128 title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kEmeKeyError)); |
129 } | 129 } |
130 | 130 |
131 #if defined(OS_ANDROID) | 131 #if defined(OS_ANDROID) |
132 virtual void SetUpCommandLine(base::CommandLine* command_line) override { | 132 void SetUpCommandLine(base::CommandLine* command_line) override { |
133 command_line->AppendSwitch( | 133 command_line->AppendSwitch( |
134 switches::kDisableGestureRequirementForMediaPlayback); | 134 switches::kDisableGestureRequirementForMediaPlayback); |
135 } | 135 } |
136 #endif | 136 #endif |
137 }; | 137 }; |
138 | 138 |
139 using ::testing::Combine; | 139 using ::testing::Combine; |
140 using ::testing::Values; | 140 using ::testing::Values; |
141 | 141 |
142 #if !defined(OS_ANDROID) | 142 #if !defined(OS_ANDROID) |
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
208 IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, UnknownKeySystemThrowsException) { | 208 IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, UnknownKeySystemThrowsException) { |
209 RunEncryptedMediaTest(kDefaultEmePlayer, | 209 RunEncryptedMediaTest(kDefaultEmePlayer, |
210 "bear-a_enc-a.webm", | 210 "bear-a_enc-a.webm", |
211 kWebMAudioOnly, | 211 kWebMAudioOnly, |
212 "com.example.foo", | 212 "com.example.foo", |
213 MSE, | 213 MSE, |
214 kEmeNotSupportedError); | 214 kEmeNotSupportedError); |
215 } | 215 } |
216 | 216 |
217 } // namespace content | 217 } // namespace content |
OLD | NEW |