OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 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/memory/scoped_ptr.h" | 6 #include "base/memory/scoped_ptr.h" |
7 #include "base/path_service.h" | 7 #include "base/path_service.h" |
8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
9 #include "base/win/windows_version.h" | 9 #include "base/win/windows_version.h" |
10 #include "chrome/browser/media/media_browsertest.h" | 10 #include "chrome/browser/media/media_browsertest.h" |
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
227 protected: | 227 protected: |
228 scoped_ptr<TestLicenseServer> license_server_; | 228 scoped_ptr<TestLicenseServer> license_server_; |
229 | 229 |
230 // We want to fail quickly when a test fails because an error is encountered. | 230 // We want to fail quickly when a test fails because an error is encountered. |
231 virtual void AddWaitForTitles(content::TitleWatcher* title_watcher) OVERRIDE { | 231 virtual void AddWaitForTitles(content::TitleWatcher* title_watcher) OVERRIDE { |
232 MediaBrowserTest::AddWaitForTitles(title_watcher); | 232 MediaBrowserTest::AddWaitForTitles(title_watcher); |
233 title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kEmeNotSupportedError)); | 233 title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kEmeNotSupportedError)); |
234 title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kEmeKeyError)); | 234 title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kEmeKeyError)); |
235 } | 235 } |
236 | 236 |
237 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { | |
238 #if defined(OS_ANDROID) | |
239 command_line->AppendSwitch( | |
240 switches::kDisableGestureRequirementForMediaPlayback); | |
241 #endif // defined(OS_ANDROID) | |
242 } | |
243 | |
244 void SetUpCommandLineForKeySystem(const std::string& key_system, | 237 void SetUpCommandLineForKeySystem(const std::string& key_system, |
245 CommandLine* command_line) { | 238 CommandLine* command_line) { |
246 if (GetServerConfig(key_system)) | 239 if (GetServerConfig(key_system)) |
247 // Since the web and license servers listen on different ports, we need to | 240 // Since the web and license servers listen on different ports, we need to |
248 // disable web-security to send license requests to the license server. | 241 // disable web-security to send license requests to the license server. |
249 // TODO(shadi): Add port forwarding to the test web server configuration. | 242 // TODO(shadi): Add port forwarding to the test web server configuration. |
250 command_line->AppendSwitch(switches::kDisableWebSecurity); | 243 command_line->AppendSwitch(switches::kDisableWebSecurity); |
251 | 244 |
252 #if defined(ENABLE_PEPPER_CDMS) | 245 #if defined(ENABLE_PEPPER_CDMS) |
253 if (IsExternalClearKey(key_system)) { | 246 if (IsExternalClearKey(key_system)) { |
(...skipping 405 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
659 "bear-320x240-v_enc-v.webm", | 652 "bear-320x240-v_enc-v.webm", |
660 kWebMVideoOnly, | 653 kWebMVideoOnly, |
661 kExternalClearKeyKeySystem, | 654 kExternalClearKeyKeySystem, |
662 SRC, | 655 SRC, |
663 PREFIXED, | 656 PREFIXED, |
664 kUnknownSession, | 657 kUnknownSession, |
665 false, | 658 false, |
666 kEmeKeyError); | 659 kEmeKeyError); |
667 } | 660 } |
668 #endif // defined(ENABLE_PEPPER_CDMS) | 661 #endif // defined(ENABLE_PEPPER_CDMS) |
OLD | NEW |