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 <memory> | 5 #include <memory> |
6 #include <utility> | 6 #include <utility> |
7 | 7 |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/path_service.h" | 9 #include "base/path_service.h" |
10 #include "base/strings/string_number_conversions.h" | 10 #include "base/strings/string_number_conversions.h" |
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
260 title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kEmeLoadFailed)); | 260 title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kEmeLoadFailed)); |
261 title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kEmeUpdateFailed)); | 261 title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kEmeUpdateFailed)); |
262 title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kEmeErrorEvent)); | 262 title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kEmeErrorEvent)); |
263 title_watcher->AlsoWaitForTitle( | 263 title_watcher->AlsoWaitForTitle( |
264 base::ASCIIToUTF16(kEmeMessageUnexpectedType)); | 264 base::ASCIIToUTF16(kEmeMessageUnexpectedType)); |
265 title_watcher->AlsoWaitForTitle( | 265 title_watcher->AlsoWaitForTitle( |
266 base::ASCIIToUTF16(kEmeRenewalMissingHeader)); | 266 base::ASCIIToUTF16(kEmeRenewalMissingHeader)); |
267 } | 267 } |
268 | 268 |
269 void SetUpCommandLine(base::CommandLine* command_line) override { | 269 void SetUpCommandLine(base::CommandLine* command_line) override { |
270 command_line->AppendSwitch(switches::kIgnoreAutoplayRestrictionsForTests); | 270 command_line->AppendSwitch( |
| 271 switches::kDisableGestureRequirementForMediaPlayback); |
271 command_line->AppendSwitch(switches::kEnableVp9InMp4); | 272 command_line->AppendSwitch(switches::kEnableVp9InMp4); |
272 } | 273 } |
273 | 274 |
274 #if BUILDFLAG(ENABLE_PEPPER_CDMS) | 275 #if BUILDFLAG(ENABLE_PEPPER_CDMS) |
275 void SetUpDefaultCommandLine(base::CommandLine* command_line) override { | 276 void SetUpDefaultCommandLine(base::CommandLine* command_line) override { |
276 base::CommandLine default_command_line(base::CommandLine::NO_PROGRAM); | 277 base::CommandLine default_command_line(base::CommandLine::NO_PROGRAM); |
277 InProcessBrowserTest::SetUpDefaultCommandLine(&default_command_line); | 278 InProcessBrowserTest::SetUpDefaultCommandLine(&default_command_line); |
278 test_launcher_utils::RemoveCommandLineSwitch( | 279 test_launcher_utils::RemoveCommandLineSwitch( |
279 default_command_line, switches::kDisableComponentUpdate, command_line); | 280 default_command_line, switches::kDisableComponentUpdate, command_line); |
280 } | 281 } |
(...skipping 458 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
739 #endif // BUILDFLAG(ENABLE_PEPPER_CDMS) | 740 #endif // BUILDFLAG(ENABLE_PEPPER_CDMS) |
740 | 741 |
741 #if BUILDFLAG(ENABLE_CDM_HOST_VERIFICATION) | 742 #if BUILDFLAG(ENABLE_CDM_HOST_VERIFICATION) |
742 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, VerifyCdmHostTest) { | 743 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, VerifyCdmHostTest) { |
743 TestNonPlaybackCases(kExternalClearKeyVerifyCdmHostTestKeySystem, | 744 TestNonPlaybackCases(kExternalClearKeyVerifyCdmHostTestKeySystem, |
744 kUnitTestSuccess); | 745 kUnitTestSuccess); |
745 } | 746 } |
746 #endif // BUILDFLAG(ENABLE_CDM_HOST_VERIFICATION) | 747 #endif // BUILDFLAG(ENABLE_CDM_HOST_VERIFICATION) |
747 | 748 |
748 } // namespace chrome | 749 } // namespace chrome |
OLD | NEW |