Move KeySystemInfo to media.

chrome/renderer/media/chrome_key_systems.cc

 // 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.
 
 #include "chrome/renderer/media/chrome_key_systems.h"
 
 #include <string>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/common/render_messages.h"
 #include "components/cdm/renderer/widevine_key_systems.h"
-#include "content/public/common/eme_constants.h"
 #include "content/public/renderer/render_thread.h"
+#include "media/base/eme_constants.h"
 
 #if defined(OS_ANDROID)
 #include "components/cdm/renderer/android_key_systems.h"
 #endif
 
 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.
 
 // The following must be after widevine_cdm_version.h.
 
 #if defined(WIDEVINE_CDM_AVAILABLE) && defined(WIDEVINE_CDM_MIN_GLIBC_VERSION)
 #include <gnu/libc-version.h>
 #include "base/version.h"
 #endif
 
-using content::KeySystemInfo;
-using content::SupportedCodecs;
+using media::KeySystemInfo;
+using media::SupportedCodecs;
 
 #if defined(ENABLE_PEPPER_CDMS)
 static bool IsPepperCdmAvailable(
     const std::string& pepper_type,
     std::vector<base::string16>* additional_param_names,
     std::vector<base::string16>* additional_param_values) {
   bool is_available = false;
   content::RenderThread::Get()->Send(
       new ChromeViewHostMsg_IsInternalPluginAvailableForMimeType(
           pepper_type,
@@ skipping 23 matching lines @@
   std::vector<base::string16> additional_param_names;
   std::vector<base::string16> additional_param_values;
   if (!IsPepperCdmAvailable(kExternalClearKeyPepperType,
                             &additional_param_names,
                             &additional_param_values)) {
     return;
   }
 
   KeySystemInfo info(kExternalClearKeyKeySystem);
 
-  info.supported_codecs = content::EME_CODEC_WEBM_ALL;
-  info.supported_init_data_types = content::EME_INIT_DATA_TYPE_WEBM;
+  info.supported_codecs = media::EME_CODEC_WEBM_ALL;
+  info.supported_init_data_types = media::EME_INIT_DATA_TYPE_WEBM;
 #if defined(USE_PROPRIETARY_CODECS)
-  info.supported_codecs |= content::EME_CODEC_MP4_ALL;
-  info.supported_init_data_types |= content::EME_INIT_DATA_TYPE_CENC;
+  info.supported_codecs |= media::EME_CODEC_MP4_ALL;
+  info.supported_init_data_types |= media::EME_INIT_DATA_TYPE_CENC;
 #endif  // defined(USE_PROPRIETARY_CODECS)
 
   info.pepper_type = kExternalClearKeyPepperType;
 
   concrete_key_systems->push_back(info);
 
   // Add support of decrypt-only mode in ClearKeyCdm.
   info.key_system = kExternalClearKeyDecryptOnlyKeySystem;
   concrete_key_systems->push_back(info);
 
@@ skipping 57 matching lines @@
                             &additional_param_values)) {
     DVLOG(1) << "Widevine CDM is not currently available.";
     return;
   }
 
   std::vector<std::string> codecs;
   GetSupportedCodecsForPepperCdm(additional_param_names,
                                  additional_param_values,
                                  &codecs);
 
-  SupportedCodecs supported_codecs = content::EME_CODEC_NONE;
+  SupportedCodecs supported_codecs = media::EME_CODEC_NONE;
   for (size_t i = 0; i < codecs.size(); ++i) {
     if (codecs[i] == kCdmSupportedCodecVorbis)
-      supported_codecs |= content::EME_CODEC_WEBM_VORBIS;
+      supported_codecs |= media::EME_CODEC_WEBM_VORBIS;
     if (codecs[i] == kCdmSupportedCodecVp8)
-      supported_codecs |= content::EME_CODEC_WEBM_VP8;
+      supported_codecs |= media::EME_CODEC_WEBM_VP8;
     if (codecs[i] == kCdmSupportedCodecVp9)
-      supported_codecs |= content::EME_CODEC_WEBM_VP9;
+      supported_codecs |= media::EME_CODEC_WEBM_VP9;
 #if defined(USE_PROPRIETARY_CODECS)
     if (codecs[i] == kCdmSupportedCodecAac)
-      supported_codecs |= content::EME_CODEC_MP4_AAC;
+      supported_codecs |= media::EME_CODEC_MP4_AAC;
     if (codecs[i] == kCdmSupportedCodecAvc1)
-      supported_codecs |= content::EME_CODEC_MP4_AVC1;
+      supported_codecs |= media::EME_CODEC_MP4_AVC1;
 #endif  // defined(USE_PROPRIETARY_CODECS)
   }
 
   cdm::AddWidevineWithCodecs(cdm::WIDEVINE,
                              supported_codecs,
                              concrete_key_systems);
 }
 #endif  // defined(WIDEVINE_CDM_AVAILABLE)
 #endif  // defined(ENABLE_PEPPER_CDMS)
 
 void AddChromeKeySystems(std::vector<KeySystemInfo>* key_systems_info) {
 #if defined(ENABLE_PEPPER_CDMS)
   AddExternalClearKey(key_systems_info);
 
 #if defined(WIDEVINE_CDM_AVAILABLE)
   AddPepperBasedWidevine(key_systems_info);
 #endif  // defined(WIDEVINE_CDM_AVAILABLE)
 #endif  // defined(ENABLE_PEPPER_CDMS)
 
 #if defined(OS_ANDROID)
   cdm::AddAndroidWidevine(key_systems_info);
 #endif  // defined(OS_ANDROID)
 }