media: Move key_system_names to media/base/

media/base/key_system_names.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // 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>
 
 #include "media/base/media_export.h"
 
 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);
 
 // Returns true if |key_system| is (reverse) sub-domain of |base|.
 MEDIA_EXPORT bool IsChildKeySystemOf(const std::string& key_system,
                                      const std::string& base);
 
 // Returns true if |key_system| is External Clear Key, false otherwise.
 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_