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

Unified Diff: media/base/key_systems.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/base/key_system_names.cc ('k') | media/blink/webcontentdecryptionmodulesession_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/key_systems.cc
diff --git a/media/base/key_systems.cc b/media/base/key_systems.cc
index 8be884fef257095f134157205dde87e9e70c181f..7ccec771b7327fef723cd338b22f9e42a4ae90ed 100644
--- a/media/base/key_systems.cc
+++ b/media/base/key_systems.cc
@@ -17,10 +17,10 @@
#include "base/time/time.h"
#include "build/build_config.h"
#include "media/base/key_system_info.h"
+#include "media/base/key_system_names.h"
#include "media/base/key_system_properties.h"
#include "media/base/media.h"
#include "media/base/media_client.h"
-#include "media/cdm/key_system_names.h"
#include "media/media_features.h"
#include "third_party/widevine/cdm/widevine_cdm_common.h"
@@ -169,7 +169,7 @@ static bool IsPotentiallySupportedKeySystem(const std::string& key_system) {
// Known and supported key systems.
if (key_system == kWidevineKeySystem)
return true;
- if (key_system == kClearKey)
+ if (key_system == kClearKeyKeySystem)
return true;
// External Clear Key is known and supports suffixes for testing.
« no previous file with comments | « media/base/key_system_names.cc ('k') | media/blink/webcontentdecryptionmodulesession_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698