media: Move key_system_names to media/base/

media/base/key_system_names.h

Index: media/base/key_system_names.h
diff --git a/media/cdm/key_system_names.h b/media/base/key_system_names.h
similarity index 73%
rename from media/cdm/key_system_names.h
rename to media/base/key_system_names.h
index 8b231718fffa89d8620f0751cc68783cd229ebac..691b7ad21a69996da61338a2881315d1f26ec9fc 100644
--- a/media/cdm/key_system_names.h
+++ b/media/base/key_system_names.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_CDM_KEY_SYSTEM_NAMES_H_
-#define MEDIA_CDM_KEY_SYSTEM_NAMES_H_
+#ifndef MEDIA_BASE_KEY_SYSTEM_NAMES_H_
+#define MEDIA_BASE_KEY_SYSTEM_NAMES_H_
 
 #include <string>
 
@@ -11,14 +11,12 @@
 
 namespace media {
 
-// TODO(jrummell): Change other uses of Clear Key to use this common value.
+// TODO(jrummell): This file should be folded into key_systems.cc as that is
+// the primary user of these functions. http://crbug.com/606579.
 
 // The key system name for Clear Key.
 MEDIA_EXPORT extern const char kClearKey[];

[ddorwin, 2016/04/27 19:03:27]

We could probably eliminate this by duplicating it in a couple places. This
would reduce the likelihood of others using it.

[jrummell, 2016/04/27 22:42:01]

Done.

 
-// The key system name for External Clear Key.
-MEDIA_EXPORT extern const char kExternalClearKey[];
-
 // Returns true if |key_system| is Clear Key, false otherwise.
 MEDIA_EXPORT bool IsClearKey(const std::string& key_system);
 
@@ -31,4 +29,4 @@ MEDIA_EXPORT bool IsExternalClearKey(const std::string& key_system);
 
 }  // namespace media
 
-#endif  // MEDIA_CDM_KEY_SYSTEM_NAMES_H_
+#endif  // MEDIA_BASE_KEY_SYSTEM_NAMES_H_