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

Unified Diff: content/browser/encrypted_media_browsertest.cc

Issue 11111007: Run the PPAPI CDMs out-of-process in the Encrypted Media browser tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/encrypted_media_browsertest.cc
diff --git a/content/browser/encrypted_media_browsertest.cc b/content/browser/encrypted_media_browsertest.cc
index e45d36b2d5ac8e388fe8b117fcc0b9ec1e4bda3e..a00e5dbfb5d41bca08efab9cea97a630980443eb 100644
--- a/content/browser/encrypted_media_browsertest.cc
+++ b/content/browser/encrypted_media_browsertest.cc
@@ -64,28 +64,27 @@ class EncryptedMediaTest
}
protected:
- // Registers all necessary CDM plugins.
+ // Registers any CDM plugins not registered by default.
virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
command_line->AppendSwitch(switches::kDisableAudio);
command_line->AppendSwitch(switches::kEnableEncryptedMedia);
+ command_line->AppendSwitch(switches::kPpapiOutOfProcess);
- // Append the switch to register the clearkeycdm plugin.
- // library name = <out dir>/<test_name>.<library_extension>
- // MIME type = application/x-ppapi-clearkey-cdm
+ // Append the switch to register the Clear Key CDM plugin.
FilePath plugin_dir;
EXPECT_TRUE(PathService::Get(base::DIR_MODULE, &plugin_dir));
FilePath plugin_lib = plugin_dir.Append(kLibraryName);
EXPECT_TRUE(file_util::PathExists(plugin_lib));
FilePath::StringType pepper_plugin = plugin_lib.value();
pepper_plugin.append(FILE_PATH_LITERAL(
- "#ClearKey CDM#ClearKey CDM 0.1.0.0#0.1.0.0;"));
- #if defined(OS_WIN)
+ "#Clear Key CDM#Clear Key CDM 0.1.0.0#0.1.0.0;"));
+#if defined(OS_WIN)
pepper_plugin.append(ASCIIToWide(
webkit_media::GetPluginType(kExternalClearKeyKeySystem)));
- #else
+#else
pepper_plugin.append(
webkit_media::GetPluginType(kExternalClearKeyKeySystem));
- #endif
+#endif
command_line->AppendSwitchNative(switches::kRegisterPepperPlugins,
pepper_plugin);
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698