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

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

Issue 2773283002: media: Simplify CdmHostFile(s) (Closed)
Patch Set: comments addressed Created 3 years, 8 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 | content/browser/ppapi_plugin_process_host.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 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
287 // Since the web and license servers listen on different ports, we need to 287 // Since the web and license servers listen on different ports, we need to
288 // disable web-security to send license requests to the license server. 288 // disable web-security to send license requests to the license server.
289 // TODO(shadi): Add port forwarding to the test web server configuration. 289 // TODO(shadi): Add port forwarding to the test web server configuration.
290 command_line->AppendSwitch(switches::kDisableWebSecurity); 290 command_line->AppendSwitch(switches::kDisableWebSecurity);
291 291
292 #if BUILDFLAG(ENABLE_PEPPER_CDMS) 292 #if BUILDFLAG(ENABLE_PEPPER_CDMS)
293 if (IsExternalClearKey(key_system)) { 293 if (IsExternalClearKey(key_system)) {
294 RegisterPepperCdm(command_line, kClearKeyCdmBaseDirectory, 294 RegisterPepperCdm(command_line, kClearKeyCdmBaseDirectory,
295 kClearKeyCdmAdapterFileName, kClearKeyCdmDisplayName, 295 kClearKeyCdmAdapterFileName, kClearKeyCdmDisplayName,
296 kClearKeyCdmPepperMimeType); 296 kClearKeyCdmPepperMimeType);
297 // Need to tell CdmHostFile(s) to ignore missing CDM host files in tests.
298 command_line->AppendSwitch(switches::kIgnoreMissingCdmHostFile);
299 command_line->AppendSwitchASCII(switches::kEnableFeatures, 297 command_line->AppendSwitchASCII(switches::kEnableFeatures,
300 media::kExternalClearKeyForTesting.name); 298 media::kExternalClearKeyForTesting.name);
301 } 299 }
302 #endif // BUILDFLAG(ENABLE_PEPPER_CDMS) 300 #endif // BUILDFLAG(ENABLE_PEPPER_CDMS)
303 } 301 }
304 }; 302 };
305 303
306 #if BUILDFLAG(ENABLE_PEPPER_CDMS) 304 #if BUILDFLAG(ENABLE_PEPPER_CDMS)
307 // Tests encrypted media playback using ExternalClearKey key system in 305 // Tests encrypted media playback using ExternalClearKey key system in
308 // decrypt-and-decode mode. 306 // decrypt-and-decode mode.
(...skipping 433 matching lines...) Expand 10 before | Expand all | Expand 10 after
742 #endif // BUILDFLAG(ENABLE_PEPPER_CDMS) 740 #endif // BUILDFLAG(ENABLE_PEPPER_CDMS)
743 741
744 #if BUILDFLAG(ENABLE_CDM_HOST_VERIFICATION) 742 #if BUILDFLAG(ENABLE_CDM_HOST_VERIFICATION)
745 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, VerifyCdmHostTest) { 743 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, VerifyCdmHostTest) {
746 TestNonPlaybackCases(kExternalClearKeyVerifyCdmHostTestKeySystem, 744 TestNonPlaybackCases(kExternalClearKeyVerifyCdmHostTestKeySystem,
747 kUnitTestSuccess); 745 kUnitTestSuccess);
748 } 746 }
749 #endif // BUILDFLAG(ENABLE_CDM_HOST_VERIFICATION) 747 #endif // BUILDFLAG(ENABLE_CDM_HOST_VERIFICATION)
750 748
751 } // namespace chrome 749 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | content/browser/ppapi_plugin_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698