EME: Remove WidevineCdmType.

components/cdm/renderer/android_key_systems.cc

 // Copyright 2014 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 "components/cdm/renderer/android_key_systems.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 33 matching lines @@
 void AddAndroidWidevine(std::vector<KeySystemInfo>* concrete_key_systems) {
   SupportedKeySystemResponse response = QueryKeySystemSupport(
       kWidevineKeySystem);
 
   // Since we do not control the implementation of the MediaDrm API on Android,
   // we assume that it can and will make use of persistence even though no
   // persistence-based features are supported.
 
   if (response.compositing_codecs != media::EME_CODEC_NONE) {
     AddWidevineWithCodecs(
-        WIDEVINE,
         response.compositing_codecs,           // Regular codecs.
         response.non_compositing_codecs,       // Hardware-secure codecs.
         EmeRobustness::HW_SECURE_CRYPTO,       // Max audio robustness.
         EmeRobustness::HW_SECURE_ALL,          // Max video robustness.
         EmeSessionTypeSupport::NOT_SUPPORTED,  // persistent-license.
         EmeSessionTypeSupport::NOT_SUPPORTED,  // persistent-release-message.
         EmeFeatureSupport::ALWAYS_ENABLED,     // Persistent state.
         EmeFeatureSupport::ALWAYS_ENABLED,     // Distinctive identifier.
         concrete_key_systems);
   } else {
     // It doesn't make sense to support secure codecs but not regular codecs.
     DCHECK(response.non_compositing_codecs == media::EME_CODEC_NONE);
   }
-
-  // For compatibility with the prefixed API, register a separate L1 key system.
-  // This key systems acts as though only hardware-secure codecs are available.
-  // We only register support for codecs with both regular and hardware-secure
-  // variants so that we can be sure they will work regardless of the renderer
-  // preference.
-  SupportedCodecs secure_codecs =
-      response.compositing_codecs & response.non_compositing_codecs;
-  if (secure_codecs != media::EME_CODEC_NONE) {
-    // Note: The prefixed API only consults the regular codecs field.
-    AddWidevineWithCodecs(
-        WIDEVINE_HR_NON_COMPOSITING,
-        secure_codecs,                         // Regular codecs.
-        media::EME_CODEC_NONE,                 // Hardware-secure codecs.
-        EmeRobustness::HW_SECURE_CRYPTO,       // Max audio robustness.
-        EmeRobustness::HW_SECURE_ALL,          // Max video robustness.
-        EmeSessionTypeSupport::NOT_SUPPORTED,  // persistent-license.
-        EmeSessionTypeSupport::NOT_SUPPORTED,  // persistent-release-message.
-        EmeFeatureSupport::ALWAYS_ENABLED,     // Persistent state.
-        EmeFeatureSupport::ALWAYS_ENABLED,     // Distinctive identifier.
-        concrete_key_systems);
-  }
 }
 
 void AddAndroidPlatformKeySystems(
     std::vector<KeySystemInfo>* concrete_key_systems) {
   std::vector<std::string> key_system_names;
   content::RenderThread::Get()->Send(
       new ChromeViewHostMsg_GetPlatformKeySystemNames(&key_system_names));
 
   for (std::vector<std::string>::const_iterator it = key_system_names.begin();
        it != key_system_names.end(); ++it) {
@@ skipping 21 matching lines @@
           media::EmeSessionTypeSupport::NOT_SUPPORTED;
       info.persistent_state_support = media::EmeFeatureSupport::ALWAYS_ENABLED;
       info.distinctive_identifier_support =
           media::EmeFeatureSupport::ALWAYS_ENABLED;
       concrete_key_systems->push_back(info);
     }
   }
 }
 
 }  // namespace cdm