media: No longer treat empty robustness differently on ChromeOS

components/cdm/renderer/widevine_key_system_properties.cc

 // Copyright 2016 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 "components/cdm/renderer/widevine_key_system_properties.h"
 
 #include "ppapi/features/features.h"
 #include "widevine_cdm_version.h"  // In SHARED_INTERMEDIATE_DIR.
 
 #if defined(WIDEVINE_CDM_AVAILABLE)
@@ skipping 101 matching lines @@
   // robustness requirement is not supported.
   if ((max_robustness == Robustness::HW_SECURE_CRYPTO &&
        robustness == Robustness::SW_SECURE_DECODE) ||
       (max_robustness == Robustness::SW_SECURE_DECODE &&
        robustness == Robustness::HW_SECURE_CRYPTO) ||
       robustness > max_robustness) {
     return EmeConfigRule::NOT_SUPPORTED;
   }
 
 #if defined(OS_CHROMEOS)
-  // TODO(ddorwin): Remove this once we have confirmed it is not necessary.
-  // See https://crbug.com/482277
-  if (robustness == Robustness::EMPTY)
-    return EmeConfigRule::SUPPORTED;
-
   // Hardware security requires remote attestation.
   if (robustness >= Robustness::HW_SECURE_CRYPTO)
     return EmeConfigRule::IDENTIFIER_REQUIRED;
 
   // For video, recommend remote attestation if HW_SECURE_ALL is available,
+  // regardless of the value of |robustness|, even when it's Robustness::EMPTY,

[ddorwin, 2016/11/18 23:50:07]

EMPTY is not supposed to be special, so there is no need to call it out IMO.
Thus, I'd remove " even when it's Robustness::EMPTY,"

[xhwang, 2016/11/21 18:13:46]

Done.

   // because it enables hardware accelerated decoding.
   // TODO(sandersd): Only do this when hardware accelerated decoding is
   // available for the requested codecs.
   if (media_type == EmeMediaType::VIDEO &&
       max_robustness == Robustness::HW_SECURE_ALL) {
     return EmeConfigRule::IDENTIFIER_RECOMMENDED;
   }
 #elif defined(OS_ANDROID)
   // Require hardware secure codecs when SW_SECURE_DECODE or above is specified.
   if (robustness >= Robustness::SW_SECURE_DECODE) {
@@ skipping 26 matching lines @@
 
 #if BUILDFLAG(ENABLE_PEPPER_CDMS)
 std::string WidevineKeySystemProperties::GetPepperType() const {
   return kWidevineCdmPluginMimeType;
 }
 #endif
 
 }  // namespace cdm
 
 #endif  // WIDEVINE_CDM_AVAILABLE