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

Side by Side Diff: content/browser/encrypted_media_browsertest.cc

Issue 10899021: Add CDM video decoder. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add media library initialization. Created 8 years, 2 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "base/string16.h" 8 #include "base/string16.h"
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "base/stringprintf.h" 10 #include "base/stringprintf.h"
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 "#Clear Key CDM#Clear Key CDM 0.1.0.0#0.1.0.0;")); 94 "#Clear Key CDM#Clear Key CDM 0.1.0.0#0.1.0.0;"));
95 #if defined(OS_WIN) 95 #if defined(OS_WIN)
96 pepper_plugin.append(ASCIIToWide( 96 pepper_plugin.append(ASCIIToWide(
97 webkit_media::GetPluginType(kExternalClearKeyKeySystem))); 97 webkit_media::GetPluginType(kExternalClearKeyKeySystem)));
98 #else 98 #else
99 pepper_plugin.append( 99 pepper_plugin.append(
100 webkit_media::GetPluginType(kExternalClearKeyKeySystem)); 100 webkit_media::GetPluginType(kExternalClearKeyKeySystem));
101 #endif 101 #endif
102 command_line->AppendSwitchNative(switches::kRegisterPepperPlugins, 102 command_line->AppendSwitchNative(switches::kRegisterPepperPlugins,
103 pepper_plugin); 103 pepper_plugin);
104 // TODO(tomfinegan): Make ExternalClearKey tests work in the sandbox.
105 command_line->AppendSwitch(switches::kNoSandbox);
106 #if defined(OS_LINUX)
107 command_line->AppendSwitch(switches::kDisableSeccompSandbox);
108 command_line->AppendSwitch(switches::kDisableSeccompFilterSandbox);
109 #endif
104 } 110 }
105 }; 111 };
106 112
107 // Fails on Linux/ChromeOS with ASan. http://crbug.com/153231 113 // Fails on Linux/ChromeOS with ASan. http://crbug.com/153231
108 // IN_PROC_BROWSER_TEST_P doesn't accept #define MAYBE_test DISABLED_test. 114 // IN_PROC_BROWSER_TEST_P doesn't accept #define MAYBE_test DISABLED_test.
109 #if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(ADDRESS_SANITIZER) 115 #if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(ADDRESS_SANITIZER)
110 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, DISABLED_BasicPlayback) { 116 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, DISABLED_BasicPlayback) {
111 const string16 kExpected = ASCIIToUTF16("ENDED"); 117 const string16 kExpected = ASCIIToUTF16("ENDED");
112 ASSERT_NO_FATAL_FAILURE(TestSimplePlayback("bear-320x240-encrypted.webm", 118 ASSERT_NO_FATAL_FAILURE(TestSimplePlayback("bear-320x240-encrypted.webm",
113 GetParam(), kExpected)); 119 GetParam(), kExpected));
(...skipping 24 matching lines...) Expand all
138 } 144 }
139 145
140 INSTANTIATE_TEST_CASE_P(ClearKey, EncryptedMediaTest, 146 INSTANTIATE_TEST_CASE_P(ClearKey, EncryptedMediaTest,
141 ::testing::Values(kClearKeyKeySystem)); 147 ::testing::Values(kClearKeyKeySystem));
142 148
143 // http://crbug.com/152864 149 // http://crbug.com/152864
144 #if !defined(OS_MACOSX) 150 #if !defined(OS_MACOSX)
145 INSTANTIATE_TEST_CASE_P(ExternalClearKey, EncryptedMediaTest, 151 INSTANTIATE_TEST_CASE_P(ExternalClearKey, EncryptedMediaTest,
146 ::testing::Values(kExternalClearKeyKeySystem)); 152 ::testing::Values(kExternalClearKeyKeySystem));
147 #endif 153 #endif
OLDNEW
« no previous file with comments | « no previous file | content/public/common/content_switches.h » ('j') | webkit/media/crypto/ppapi/clear_key_cdm.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698