Implement robustness strings in requestMediaKeySystemAccess().

components/cdm/renderer/android_key_systems.cc

 // Copyright 2014 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/android_key_systems.h"
 
 #include <string>
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 22 matching lines @@
       << "unrecognized codec";
   DCHECK(!(response.non_compositing_codecs & ~media::EME_CODEC_ALL))
       << "unrecognized codec";
   return response;
 }
 
 void AddAndroidWidevine(std::vector<KeySystemInfo>* concrete_key_systems) {
   SupportedKeySystemResponse response = QueryKeySystemSupport(
       kWidevineKeySystem);
   if (response.compositing_codecs != media::EME_CODEC_NONE) {
+    // When creating the WIDEVINE key system, BrowserCdmFactoryAndroid
+    // configures the CDM's security level based on the
+    // --mediadrm-enable-non-compositing flag. Therefore the supported
+    // codec/robustenss combinations depend on that flag.
+    // TODO(sandersd): For unprefixed, set the security level based on the
+    // requested robustness instead of the flag.
+    SupportedCodecs codecs =
+        static_cast<SupportedCodecs>(response.compositing_codecs);
+    if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+            switches::kMediaDrmEnableNonCompositing)) {
+      codecs = static_cast<SupportedCodecs>(response.non_compositing_codecs);

[ddorwin, 2015/03/13 19:24:47]

Note: Using non_compositing_codecs here matches the actual behavior (comment
below).

Does it make sense to instead use the logic at 65 rather than checking the
switch here?

[sandersd (OOO until July 31), 2015/03/13 20:11:56]

I rearranged this to make it more correct, but the short answer is yes, the flag
is separate from platform support for the codecs.

+    }
     AddWidevineWithCodecs(
         WIDEVINE,
-        static_cast<SupportedCodecs>(response.compositing_codecs),
+        codecs,
         media::EME_SESSION_TYPE_NOT_SUPPORTED,  // Persistent license.
         media::EME_SESSION_TYPE_NOT_SUPPORTED,  // Persistent release message.
         media::EME_FEATURE_NOT_SUPPORTED,       // Persistent state.
         media::EME_FEATURE_ALWAYS_ENABLED,      // Distinctive identifier.
         concrete_key_systems);
   }
 
   if (response.non_compositing_codecs != media::EME_CODEC_NONE) {
+    // When creating the WIDEVINE_HR_NON_COMPOSITING key system,

[ddorwin, 2015/03/13 19:24:47]

This is the "L1 key system". It's actually confusing that the one above will be
L1. Perhaps this comment belongs up there. Do we have a bug to fix that code?

[sandersd (OOO until July 31), 2015/03/13 20:11:56]

Turns out we do. Done.

[ddorwin, 2015/03/16 23:25:07]

As I noted, I don't think that bug covers this issue.

[sandersd (OOO until July 31), 2015/03/17 22:10:37]

Acknowledged.

+    // BrowserCdmFactoryAndroid does not configure the CDM's security level
+    // (that is, leaves it as L1).
     // TODO(ddorwin): Remove with unprefixed. http://crbug.com/249976
     AddWidevineWithCodecs(
         WIDEVINE_HR_NON_COMPOSITING,
         static_cast<SupportedCodecs>(response.non_compositing_codecs),
         media::EME_SESSION_TYPE_NOT_SUPPORTED,  // Persistent license.
         media::EME_SESSION_TYPE_NOT_SUPPORTED,  // Persistent release message.
         media::EME_FEATURE_NOT_SUPPORTED,       // Persistent state.
         media::EME_FEATURE_ALWAYS_ENABLED,      // Distinctive identifier.
         concrete_key_systems);
   }
@@ skipping 26 matching lines @@
       info.persistent_release_message_support =
           media::EME_SESSION_TYPE_NOT_SUPPORTED;
       info.persistent_state_support = media::EME_FEATURE_ALWAYS_ENABLED;
       info.distinctive_identifier_support = media::EME_FEATURE_ALWAYS_ENABLED;
       concrete_key_systems->push_back(info);
     }
   }
 }
 
 }  // namespace cdm