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

Unified Diff: media/mojo/services/media_apptest.cc

Issue 1921823003: media: Move key_system_names to media/base/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/media.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/mojo/services/media_apptest.cc
diff --git a/media/mojo/services/media_apptest.cc b/media/mojo/services/media_apptest.cc
index 091fb2443871b9249deb40567994bad6e21d502c..018d57236bf50d07b4f4a6f26bb482526d44023f 100644
--- a/media/mojo/services/media_apptest.cc
+++ b/media/mojo/services/media_apptest.cc
@@ -14,7 +14,6 @@
#include "media/base/cdm_config.h"
#include "media/base/mock_filters.h"
#include "media/base/test_helpers.h"
-#include "media/cdm/key_system_names.h"
#include "media/mojo/common/media_type_converters.h"
#include "media/mojo/interfaces/content_decryption_module.mojom.h"
#include "media/mojo/interfaces/decryptor.mojom.h"
@@ -33,6 +32,7 @@ namespace media {
namespace {
#if defined(ENABLE_MOJO_CDM)
+const char kClearKeyKeySystem[] = "org.w3.clearkey";
const char kInvalidKeySystem[] = "invalid.key.system";
#endif
const char kSecurityOrigin[] = "http://foo.com";
@@ -140,7 +140,7 @@ class MediaAppTest : public shell::test::ApplicationTestBase {
#if defined(ENABLE_MOJO_CDM)
TEST_F(MediaAppTest, InitializeCdm_Success) {
- InitializeCdm(kClearKey, true, 1);
+ InitializeCdm(kClearKeyKeySystem, true, 1);
run_loop_->Run();
}
« no previous file with comments | « media/media.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698