Restore L3 support on CrOS when the media permission is denied.

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 <vector>
 
 #include "base/logging.h"
@@ skipping 172 matching lines @@
       supported_codecs |= media::EME_CODEC_WEBM_VP8;
     if (codecs[i] == kCdmSupportedCodecVp9)
       supported_codecs |= media::EME_CODEC_WEBM_VP9;
 #if defined(USE_PROPRIETARY_CODECS)
     if (codecs[i] == kCdmSupportedCodecAvc1)
       supported_codecs |= media::EME_CODEC_MP4_AVC1;
 #endif  // defined(USE_PROPRIETARY_CODECS)
   }
 
   cdm::AddWidevineWithCodecs(
-      cdm::WIDEVINE,
-      supported_codecs,
+      cdm::WIDEVINE, supported_codecs,
 #if defined(OS_CHROMEOS)
       // Persistent licenses are supported if remote attestation succeeds.
       media::EME_SESSION_TYPE_SUPPORTED_WITH_PERMISSION,
       media::EME_SESSION_TYPE_NOT_SUPPORTED,  // Persistent release message.
       // TODO(sandersd): Using ALWAYS_ENABLED prevents "not-allowed" from
       // succeeding. Change this to REQUESTABLE once the state can be blocked.
       // http://crbug.com/457482
-      media::EME_FEATURE_ALWAYS_ENABLED,      // Persistent state.
+      media::EME_FEATURE_ALWAYS_ENABLED,  // Persistent state.
       // A distinctive identifier will be available if remote attestation
       // succeeds.
-      // TODO(sandersd): Using ALWAYS_ENABLED prevents "not-allowed" from
-      // succeeding. Change this to REQUESTABLE_WITH_PERMISSION once the
-      // distinctive identifier can be blocked. http://crbug.com/457482
-      media::EME_FEATURE_ALWAYS_ENABLED,
+      media::EME_FEATURE_REQUESTABLE_WITH_PERMISSION,
 #else   // (Desktop)
       media::EME_SESSION_TYPE_NOT_SUPPORTED,  // Persistent license.
       media::EME_SESSION_TYPE_NOT_SUPPORTED,  // Persistent release message.
       // TODO(sandersd): Using ALWAYS_ENABLED prevents "not-allowed" from
       // succeeding. Change this to REQUESTABLE once the state can be blocked.
       // http://crbug.com/457482
-      media::EME_FEATURE_ALWAYS_ENABLED,      // Persistent state.
-      media::EME_FEATURE_NOT_SUPPORTED,       // Distinctive identifier.
+      media::EME_FEATURE_ALWAYS_ENABLED,  // Persistent state.
+      media::EME_FEATURE_NOT_SUPPORTED,   // Distinctive identifier.
 #endif  // defined(OS_CHROMEOS)
       concrete_key_systems);
 }
 #endif  // defined(WIDEVINE_CDM_AVAILABLE)
 #endif  // defined(ENABLE_PEPPER_CDMS)
 
 void AddChromeKeySystems(std::vector<KeySystemInfo>* key_systems_info) {
 #if defined(ENABLE_PEPPER_CDMS)
   AddExternalClearKey(key_systems_info);
 
 #if defined(WIDEVINE_CDM_AVAILABLE)
   AddPepperBasedWidevine(key_systems_info);
 #endif  // defined(WIDEVINE_CDM_AVAILABLE)
 #endif  // defined(ENABLE_PEPPER_CDMS)
 
 #if defined(OS_ANDROID)
   cdm::AddAndroidWidevine(key_systems_info);
 #endif  // defined(OS_ANDROID)
 }