EME: Close existing sessions on CDM failure

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 <stddef.h>
 
 #include <string>
 #include <vector>
@@ skipping 60 matching lines @@
   static const char kExternalClearKeyFileIOTestKeySystem[] =
       "org.chromium.externalclearkey.fileiotest";
   static const char kExternalClearKeyOutputProtectionTestKeySystem[] =
       "org.chromium.externalclearkey.outputprotectiontest";
   static const char kExternalClearKeyPlatformVerificationTestKeySystem[] =
       "org.chromium.externalclearkey.platformverificationtest";
   static const char kExternalClearKeyInitializeFailKeySystem[] =
       "org.chromium.externalclearkey.initializefail";
   static const char kExternalClearKeyCrashKeySystem[] =
       "org.chromium.externalclearkey.crash";
+  static const char kExternalClearKeyCloseOnCrashKeySystem[] =
+      "org.chromium.externalclearkey.closeoncrash";
 
   std::vector<base::string16> additional_param_names;
   std::vector<base::string16> additional_param_values;
   if (!IsPepperCdmAvailable(cdm::kExternalClearKeyPepperType,
                             &additional_param_names,
                             &additional_param_values)) {
     return;
   }
 
   concrete_key_systems->emplace_back(
@@ skipping 18 matching lines @@
   // A key system that triggers the platform verification test in ClearKeyCdm.
   concrete_key_systems->emplace_back(new cdm::ExternalClearKeyProperties(
       kExternalClearKeyPlatformVerificationTestKeySystem));
 
   // A key system that Chrome thinks is supported by ClearKeyCdm, but actually
   // will be refused by ClearKeyCdm. This is to test the CDM initialization
   // failure case.
   concrete_key_systems->emplace_back(new cdm::ExternalClearKeyProperties(
       kExternalClearKeyInitializeFailKeySystem));
 
-  // A key system that triggers a crash in ClearKeyCdm.
+  // Key systems that trigger a crash in ClearKeyCdm.
   concrete_key_systems->emplace_back(
       new cdm::ExternalClearKeyProperties(kExternalClearKeyCrashKeySystem));
+  concrete_key_systems->emplace_back(new cdm::ExternalClearKeyProperties(
+      kExternalClearKeyCloseOnCrashKeySystem));
 }
 
 #if defined(WIDEVINE_CDM_AVAILABLE)
 // This function finds "codecs" and parses the value into the vector |codecs|.
 // Converts the codec strings to UTF-8 since we only expect ASCII strings and
 // this simplifies the rest of the code in this file.
 void GetSupportedCodecsForPepperCdm(
     const std::vector<base::string16>& additional_param_names,
     const std::vector<base::string16>& additional_param_values,
     std::vector<std::string>* codecs) {
@@ skipping 99 matching lines @@
 #if defined(WIDEVINE_CDM_AVAILABLE)
   AddPepperBasedWidevine(key_systems_properties);
 #endif  // defined(WIDEVINE_CDM_AVAILABLE)
 
 #endif  // BUILDFLAG(ENABLE_PEPPER_CDMS)
 
 #if defined(OS_ANDROID)
   cdm::AddAndroidWidevine(key_systems_properties);
 #endif  // defined(OS_ANDROID)
 }