Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(380)

Side by Side Diff: chrome/browser/media/encrypted_media_browsertest.cc

Issue 2928873002: Enable VP9 in MP4 by default (Closed)
Patch Set: Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/media/encrypted_media_supported_types_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
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(switches::kIgnoreAutoplayRestrictionsForTests);
271 command_line->AppendSwitch(switches::kEnableVp9InMp4);
272 } 271 }
273 272
274 #if BUILDFLAG(ENABLE_PEPPER_CDMS) 273 #if BUILDFLAG(ENABLE_PEPPER_CDMS)
275 void SetUpDefaultCommandLine(base::CommandLine* command_line) override { 274 void SetUpDefaultCommandLine(base::CommandLine* command_line) override {
276 base::CommandLine default_command_line(base::CommandLine::NO_PROGRAM); 275 base::CommandLine default_command_line(base::CommandLine::NO_PROGRAM);
277 InProcessBrowserTest::SetUpDefaultCommandLine(&default_command_line); 276 InProcessBrowserTest::SetUpDefaultCommandLine(&default_command_line);
278 test_launcher_utils::RemoveCommandLineSwitch( 277 test_launcher_utils::RemoveCommandLineSwitch(
279 default_command_line, switches::kDisableComponentUpdate, command_line); 278 default_command_line, switches::kDisableComponentUpdate, command_line);
280 } 279 }
281 #endif // BUILDFLAG(ENABLE_PEPPER_CDMS) 280 #endif // BUILDFLAG(ENABLE_PEPPER_CDMS)
(...skipping 457 matching lines...) Expand 10 before | Expand all | Expand 10 after
739 #endif // BUILDFLAG(ENABLE_PEPPER_CDMS) 738 #endif // BUILDFLAG(ENABLE_PEPPER_CDMS)
740 739
741 #if BUILDFLAG(ENABLE_CDM_HOST_VERIFICATION) 740 #if BUILDFLAG(ENABLE_CDM_HOST_VERIFICATION)
742 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, VerifyCdmHostTest) { 741 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, VerifyCdmHostTest) {
743 TestNonPlaybackCases(kExternalClearKeyVerifyCdmHostTestKeySystem, 742 TestNonPlaybackCases(kExternalClearKeyVerifyCdmHostTestKeySystem,
744 kUnitTestSuccess); 743 kUnitTestSuccess);
745 } 744 }
746 #endif // BUILDFLAG(ENABLE_CDM_HOST_VERIFICATION) 745 #endif // BUILDFLAG(ENABLE_CDM_HOST_VERIFICATION)
747 746
748 } // namespace chrome 747 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/media/encrypted_media_supported_types_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698