Add decrypt-only external clear key browser tests.

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 "base/logging.h"
 #include "base/strings/string16.h"
@@ skipping 46 matching lines @@
           additional_param_values));
 
   return is_registered;
 }
 
 // External Clear Key (used for testing).
 static void AddExternalClearKey(
     std::vector<KeySystemInfo>* concrete_key_systems) {
   static const char kExternalClearKeyKeySystem[] =
       "org.chromium.externalclearkey";
+  static const char kDecryptOnlyExternalClearKeyKeySystem[] =
+      "org.chromium.externalclearkey.decryptonly";
   static const char kExternalClearKeyPepperType[] =
       "application/x-ppapi-clearkey-cdm";
 
   std::vector<base::string16> additional_param_names;
   std::vector<base::string16> additional_param_values;
   if (!IsPepperCdmRegistered(kExternalClearKeyPepperType,
                              &additional_param_names,
                              &additional_param_values)) {
     return;
   }
 
   KeySystemInfo info(kExternalClearKeyKeySystem);
 
   info.supported_types.push_back(std::make_pair(kAudioWebM, kVorbis));
   info.supported_types.push_back(std::make_pair(kVideoWebM, kVorbisVP8));
 #if defined(USE_PROPRIETARY_CODECS)
   info.supported_types.push_back(std::make_pair(kAudioMp4, kMp4a));
   info.supported_types.push_back(std::make_pair(kVideoMp4, kMp4aAvc1Avc3));
 #endif  // defined(USE_PROPRIETARY_CODECS)
   info.pepper_type = kExternalClearKeyPepperType;
 
   concrete_key_systems->push_back(info);
 
   // 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.
   info.key_system += ".initializefail";
   concrete_key_systems->push_back(info);
+
+  // Add support of decrypt-only mode in ClearKeyCdm.
+  info.key_system = kDecryptOnlyExternalClearKeyKeySystem;

[ddorwin, 2013/11/21 04:10:58]

This and 95 should be consistent.

[xhwang, 2013/11/22 01:47:36]

Done.

+  concrete_key_systems->push_back(info);
 }
 #endif  // defined(ENABLE_PEPPER_CDMS)
 
 
 #if defined(WIDEVINE_CDM_AVAILABLE)
 enum WidevineCdmType {
   WIDEVINE,
   WIDEVINE_HR,
 #if defined(OS_ANDROID)
   WIDEVINE_HR_NON_COMPOSITING,
@@ skipping 200 matching lines @@
 #endif
 
 #if defined(WIDEVINE_CDM_AVAILABLE)
 #if defined(ENABLE_PEPPER_CDMS)
   AddPepperBasedWidevine(key_systems_info);
 #elif defined(OS_ANDROID)
   AddAndroidWidevine(key_systems_info);
 #endif
 #endif
 }