Add support for cdm::ContentDecryptionModule_8, remove CDM_6

media/cdm/ppapi/external_clear_key/clear_key_cdm.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 "media/cdm/ppapi/external_clear_key/clear_key_cdm.h"
 
 #include <algorithm>
 #include <cstring>
 #include <sstream>
 #include <string>
@@ skipping 153 matching lines @@
     case cdm::kPersistentLicense:
       return media::MediaKeys::PERSISTENT_LICENSE_SESSION;
     case cdm::kPersistentKeyRelease:
       return media::MediaKeys::PERSISTENT_RELEASE_MESSAGE_SESSION;
   }
   NOTIMPLEMENTED();
   return media::MediaKeys::TEMPORARY_SESSION;
 }
 
 cdm::KeyStatus ConvertKeyStatus(media::CdmKeyInformation::KeyStatus status) {
-  // TODO(jrummell): Update OUTPUT_DOWNSCALED and KEY_STATUS_PENDING once CDM
-  // interface supports them. http://crbug.com/450861
   switch (status) {
     case media::CdmKeyInformation::KeyStatus::USABLE:
       return cdm::kUsable;
     case media::CdmKeyInformation::KeyStatus::INTERNAL_ERROR:
       return cdm::kInternalError;
     case media::CdmKeyInformation::KeyStatus::EXPIRED:
       return cdm::kExpired;
     case media::CdmKeyInformation::KeyStatus::OUTPUT_NOT_ALLOWED:
       return cdm::kOutputNotAllowed;
     case media::CdmKeyInformation::KeyStatus::OUTPUT_DOWNSCALED:
-      return cdm::kInternalError;
+      return cdm::kOutputDownscaled;
     case media::CdmKeyInformation::KeyStatus::KEY_STATUS_PENDING:
-      return cdm::kInternalError;
+      return cdm::kStatusPending;
   }
   NOTIMPLEMENTED();
   return cdm::kInternalError;
 }
 
 // Shallow copy all the key information from |keys_info| into |keys_vector|.
 // |keys_vector| is only valid for the lifetime of |keys_info| because it
 // contains pointers into the latter.
 void ConvertCdmKeysInfo(const std::vector<media::CdmKeyInformation*>& keys_info,
                         std::vector<cdm::KeyInformation>* keys_vector) {
@@ skipping 703 matching lines @@
 void ClearKeyCdm::OnFileIOTestComplete(bool success) {
   DVLOG(1) << __FUNCTION__ << ": " << success;
   std::string message = GetFileIOTestResultMessage(success);
   host_->OnSessionMessage(last_session_id_.data(), last_session_id_.length(),
                           cdm::kLicenseRequest, message.data(),
                           message.length(), NULL, 0);
   file_io_test_runner_.reset();
 }
 
 }  // namespace media