Store the accumulated configuration from requestMediaKeySystemAccess().

media/blink/webencryptedmediaclient_impl.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 "webencryptedmediaclient_impl.h"
 
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "media/base/key_systems.h"
@@ skipping 142 matching lines @@
     return;
   }
 
   std::string key_system = base::UTF16ToASCII(request.keySystem());
   if (!IsConcreteSupportedKeySystem(key_system)) {
     request.requestNotSupported("Unsupported keySystem");
     return;
   }
 
   // 7.2 Let implementation be the implementation of keySystem.
-  // 7.3 Follow the steps for the first matching condition from the following
-  //     list:
-  //       - If supportedConfigurations was not provided, run the Is Key System
-  //         Supported? algorithm and if successful, resolve promise with access
-  //         and abort these steps.
-  // TODO(sandersd): Remove pending the resolution of
-  // https://github.com/w3c/encrypted-media/issues/1.
+  // 7.3 For each value in supportedConfigurations, run the GetSupported
+  //     Configuration algorithm and if successful, resolve promise with access
+  //     and abort these steps.
   const blink::WebVector<blink::WebMediaKeySystemConfiguration>&
       configurations = request.supportedConfigurations();
+
+  // TODO(sandersd): Remove once Blink requires the configurations parameter for
+  // requestMediaKeySystemAccess().
   if (configurations.isEmpty()) {
     request.requestSucceeded(WebContentDecryptionModuleAccessImpl::Create(
-        request.keySystem(), request.securityOrigin(), cdm_factory_.get()));
+        request.keySystem(), blink::WebMediaKeySystemConfiguration(),
+        request.securityOrigin(), cdm_factory_.get()));
     return;
   }
 
-  //       - Otherwise, for each value in supportedConfigurations, run the
-  //         GetSuppored Configuration algorithm and if successful, resolve
-  //         promise with access and abort these steps.
   for (size_t i = 0; i < configurations.size(); i++) {
     const blink::WebMediaKeySystemConfiguration& candidate = configurations[i];
     blink::WebMediaKeySystemConfiguration accumulated_configuration;
     if (GetSupportedConfiguration(key_system, candidate,
                                   request.securityOrigin(),
                                   &accumulated_configuration)) {
-      // TODO(sandersd): Pass the accumulated configuration along.
-      // http://crbug.com/447059.
       request.requestSucceeded(WebContentDecryptionModuleAccessImpl::Create(
-          request.keySystem(), request.securityOrigin(), cdm_factory_.get()));
+          request.keySystem(), accumulated_configuration,
+          request.securityOrigin(), cdm_factory_.get()));
       return;
     }
   }
 
   // 7.4 Reject promise with a new DOMException whose name is NotSupportedError.
   request.requestNotSupported(
       "None of the requested configurations were supported.");
 }
 
 }  // namespace media