media: Move key_system_names to media/base/

media/base/key_systems.cc

Index: media/base/key_systems.cc
diff --git a/media/base/key_systems.cc b/media/base/key_systems.cc
index 94ffdc42b54d192720c22959447e013794153c34..a74ada95564950d7ba43b308fef2dd8c8281eae5 100644
--- a/media/base/key_systems.cc
+++ b/media/base/key_systems.cc
@@ -17,17 +17,15 @@
 #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"
 
 namespace media {
 
-const char kClearKeyKeySystem[] = "org.w3.clearkey";
-
 // These names are used by UMA. Do not change them!
 const char kClearKeyKeySystemNameForUMA[] = "ClearKey";
 const char kUnknownKeySystemNameForUMA[] = "Unknown";
@@ -86,7 +84,7 @@ static EmeRobustness ConvertRobustness(const std::string& robustness) {
 static void AddClearKey(
     std::vector<std::unique_ptr<KeySystemProperties>>* key_systems) {
   KeySystemInfo info;
-  info.key_system = kClearKeyKeySystem;
+  info.key_system = kClearKey;
 
   // On Android, Vorbis, VP8, AAC and AVC1 are supported in MediaCodec:
   // http://developer.android.com/guide/appendix/media-formats.html
@@ -356,8 +354,7 @@ void KeySystemsImpl::InitializeUMAInfo() {
   }
 
   // Clear Key is always supported.
-  key_system_name_for_uma_map_[kClearKeyKeySystem] =
-      kClearKeyKeySystemNameForUMA;
+  key_system_name_for_uma_map_[kClearKey] = kClearKeyKeySystemNameForUMA;
 }
 
 void KeySystemsImpl::UpdateIfNeeded() {