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/path_service.h" | 6 #include "base/path_service.h" |
7 #include "base/strings/utf_string_conversions.h" | 7 #include "base/strings/utf_string_conversions.h" |
8 #include "base/win/windows_version.h" | 8 #include "base/win/windows_version.h" |
9 #include "content/browser/media/media_browsertest.h" | 9 #include "content/browser/media/media_browsertest.h" |
10 #include "content/public/common/content_switches.h" | 10 #include "content/public/common/content_switches.h" |
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
103 kExternalClearKeyKeySystem); | 103 kExternalClearKeyKeySystem); |
104 } | 104 } |
105 | 105 |
106 virtual void RegisterPepperCdm(CommandLine* command_line, | 106 virtual void RegisterPepperCdm(CommandLine* command_line, |
107 const std::string& adapter_name, | 107 const std::string& adapter_name, |
108 const std::string& key_system) { | 108 const std::string& key_system) { |
109 // Append the switch to register the Clear Key CDM Adapter. | 109 // Append the switch to register the Clear Key CDM Adapter. |
110 base::FilePath plugin_dir; | 110 base::FilePath plugin_dir; |
111 EXPECT_TRUE(PathService::Get(base::DIR_MODULE, &plugin_dir)); | 111 EXPECT_TRUE(PathService::Get(base::DIR_MODULE, &plugin_dir)); |
112 base::FilePath plugin_lib = plugin_dir.AppendASCII(adapter_name); | 112 base::FilePath plugin_lib = plugin_dir.AppendASCII(adapter_name); |
113 EXPECT_TRUE(file_util::PathExists(plugin_lib)); | 113 EXPECT_TRUE(base::PathExists(plugin_lib)); |
114 base::FilePath::StringType pepper_plugin = plugin_lib.value(); | 114 base::FilePath::StringType pepper_plugin = plugin_lib.value(); |
115 pepper_plugin.append(FILE_PATH_LITERAL("#CDM#0.1.0.0;")); | 115 pepper_plugin.append(FILE_PATH_LITERAL("#CDM#0.1.0.0;")); |
116 #if defined(OS_WIN) | 116 #if defined(OS_WIN) |
117 pepper_plugin.append(ASCIIToWide(GetPepperType(key_system))); | 117 pepper_plugin.append(ASCIIToWide(GetPepperType(key_system))); |
118 #else | 118 #else |
119 pepper_plugin.append(GetPepperType(key_system)); | 119 pepper_plugin.append(GetPepperType(key_system)); |
120 #endif | 120 #endif |
121 command_line->AppendSwitchNative(switches::kRegisterPepperPlugins, | 121 command_line->AppendSwitchNative(switches::kRegisterPepperPlugins, |
122 pepper_plugin); | 122 pepper_plugin); |
123 } | 123 } |
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
288 | 288 |
289 IN_PROC_BROWSER_TEST_F(WVEncryptedMediaTest, Playback_AudioOnly_MP4) { | 289 IN_PROC_BROWSER_TEST_F(WVEncryptedMediaTest, Playback_AudioOnly_MP4) { |
290 TestMSESimplePlayback("bear-640x360-a_frag-cenc.mp4", kMP4AudioOnly, | 290 TestMSESimplePlayback("bear-640x360-a_frag-cenc.mp4", kMP4AudioOnly, |
291 kWidevineKeySystem); | 291 kWidevineKeySystem); |
292 } | 292 } |
293 #endif // defined(GOOGLE_CHROME_BUILD) || defined(USE_PROPRIETARY_CODECS) | 293 #endif // defined(GOOGLE_CHROME_BUILD) || defined(USE_PROPRIETARY_CODECS) |
294 #endif // !defined(DISABLE_WIDEVINE_CDM_BROWSERTESTS) | 294 #endif // !defined(DISABLE_WIDEVINE_CDM_BROWSERTESTS) |
295 #endif // defined(WIDEVINE_CDM_AVAILABLE) | 295 #endif // defined(WIDEVINE_CDM_AVAILABLE) |
296 | 296 |
297 } // namespace content | 297 } // namespace content |
OLD | NEW |