Move KeySystemInfo to media.

components/cdm/renderer/widevine_key_systems.cc

Index: components/cdm/renderer/widevine_key_systems.cc
diff --git a/components/cdm/renderer/widevine_key_systems.cc b/components/cdm/renderer/widevine_key_systems.cc
index d08b6ad9239e6d242a1bd2cf3e9e3f9e545ae091..10cd5c875d7aab11ff6d74d8ebd05d23bd22fb86 100644
--- a/components/cdm/renderer/widevine_key_systems.cc
+++ b/components/cdm/renderer/widevine_key_systems.cc
@@ -8,17 +8,17 @@
 #include <vector>
 
 #include "base/logging.h"
-#include "content/public/common/eme_constants.h"
+#include "media/base/eme_constants.h"
 
 #include "widevine_cdm_version.h"  // In SHARED_INTERMEDIATE_DIR.
 
 #if defined(WIDEVINE_CDM_AVAILABLE)
 
-using content::KeySystemInfo;
-using content::SupportedCodecs;
-
 namespace cdm {
 
+using media::KeySystemInfo;

[ddorwin, 2014/10/22 22:41:41]

Why is this done within the cdm namespace now?

[xhwang, 2014/10/23 20:39:15]

Reverted.

+using media::SupportedCodecs;
+
 // Return |name|'s parent key system.
 static std::string GetDirectParentName(std::string name) {
   size_t last_period = name.find_last_of('.');
@@ -53,11 +53,11 @@ void AddWidevineWithCodecs(WidevineCdmType widevine_cdm_type,
   // Here we assume that support for a container imples support for the
   // associated initialization data type. KeySystems handles validating
   // |init_data_type| x |container| pairings.
-  if (supported_codecs & content::EME_CODEC_WEBM_ALL)
-    info.supported_init_data_types |= content::EME_INIT_DATA_TYPE_WEBM;
+  if (supported_codecs & media::EME_CODEC_WEBM_ALL)
+    info.supported_init_data_types |= media::EME_INIT_DATA_TYPE_WEBM;
 #if defined(USE_PROPRIETARY_CODECS)
-  if (supported_codecs & content::EME_CODEC_MP4_ALL)
-    info.supported_init_data_types |= content::EME_INIT_DATA_TYPE_CENC;
+  if (supported_codecs & media::EME_CODEC_MP4_ALL)
+    info.supported_init_data_types |= media::EME_INIT_DATA_TYPE_CENC;
 #endif  // defined(USE_PROPRIETARY_CODECS)
 
 #if defined(ENABLE_PEPPER_CDMS)