Remove CDM_7 support

media/cdm/cdm_wrapper.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_CDM_WRAPPER_H_
 #define MEDIA_CDM_CDM_WRAPPER_H_
 
 #include <stdint.h>
 
 #include <string>
@@ skipping 228 matching lines @@
   }
 
  private:
   CdmWrapperImpl(CdmInterface* cdm) : cdm_(cdm) { PLATFORM_DCHECK(cdm_); }
 
   CdmInterface* cdm_;
 
   DISALLOW_COPY_AND_ASSIGN(CdmWrapperImpl);
 };
 
-// Overrides for the cdm::Host_7 methods.
-// TODO(jrummell): Remove these once Host_7 interface is removed.
-
-template <>
-void CdmWrapperImpl<cdm::ContentDecryptionModule_7>::Initialize(
-    bool allow_distinctive_identifier,
-    bool allow_persistent_state) {}
-
-template <>
-void CdmWrapperImpl<cdm::ContentDecryptionModule_7>::
-    CreateSessionAndGenerateRequest(uint32_t promise_id,
-                                    cdm::SessionType session_type,
-                                    cdm::InitDataType init_data_type,
-                                    const uint8_t* init_data,
-                                    uint32_t init_data_size) {
-  std::string init_data_type_as_string = "unknown";
-  switch (init_data_type) {
-    case cdm::kCenc:
-      init_data_type_as_string = "cenc";
-      break;
-    case cdm::kKeyIds:
-      init_data_type_as_string = "keyids";
-      break;
-    case cdm::kWebM:
-      init_data_type_as_string = "webm";
-      break;
-  }
-
-  cdm_->CreateSessionAndGenerateRequest(
-      promise_id, session_type, &init_data_type_as_string[0],
-      init_data_type_as_string.length(), init_data, init_data_size);
-}
-
 CdmWrapper* CdmWrapper::Create(CreateCdmFunc create_cdm_func,
                                const char* key_system,
                                uint32_t key_system_size,
                                GetCdmHostFunc get_cdm_host_func,
                                void* user_data) {
   static_assert(cdm::ContentDecryptionModule::kVersion ==
                     cdm::ContentDecryptionModule_8::kVersion,
                 "update the code below");
 
   // Ensure IsSupportedCdmInterfaceVersion() matches this implementation.
   // Always update this DCHECK when updating this function.
   // If this check fails, update this function and DCHECK or update
   // IsSupportedCdmInterfaceVersion().
   PLATFORM_DCHECK(!IsSupportedCdmInterfaceVersion(
                       cdm::ContentDecryptionModule_8::kVersion + 1) &&
                   IsSupportedCdmInterfaceVersion(
                       cdm::ContentDecryptionModule_8::kVersion) &&
-                  IsSupportedCdmInterfaceVersion(
-                      cdm::ContentDecryptionModule_7::kVersion) &&
                   !IsSupportedCdmInterfaceVersion(
-                      cdm::ContentDecryptionModule_7::kVersion - 1));
+                      cdm::ContentDecryptionModule_8::kVersion - 1));
 
   // Try to create the CDM using the latest CDM interface version.
   CdmWrapper* cdm_wrapper =
       CdmWrapperImpl<cdm::ContentDecryptionModule>::Create(
           create_cdm_func, key_system, key_system_size, get_cdm_host_func,
           user_data);
 
-  // If |cdm_wrapper| is NULL, try to create the CDM using older supported
-  // versions of the CDM interface here.
-  if (!cdm_wrapper) {
-    cdm_wrapper = CdmWrapperImpl<cdm::ContentDecryptionModule_7>::Create(
-        create_cdm_func, key_system, key_system_size, get_cdm_host_func,
-        user_data);
-  }
-
   return cdm_wrapper;
 }
 
 // When updating the CdmAdapter, ensure you've updated the CdmWrapper to contain
 // stub implementations for new or modified methods that the older CDM interface
 // does not have.
 // Also update supported_cdm_versions.h.
 static_assert(cdm::ContentDecryptionModule::kVersion ==
                   cdm::ContentDecryptionModule_8::kVersion,
               "ensure cdm wrapper templates have old version support");
 
 }  // namespace media
 
 #undef PLATFORM_DCHECK
 
 #endif  // MEDIA_CDM_CDM_WRAPPER_H_