Initialize the CDM asynchronously

media/cdm/proxy_decryptor.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 "media/cdm/proxy_decryptor.h"
 
 #include <cstring>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 76 matching lines @@
 }
 
 void ProxyDecryptor::OnCdmCreated(const std::string& key_system,
                                   const GURL& security_origin,
                                   const CdmContextReadyCB& cdm_context_ready_cb,
                                   scoped_ptr<MediaKeys> cdm) {
   is_creating_cdm_ = false;
 
   if (!cdm) {
     cdm_context_ready_cb.Run(nullptr);
-    return;
+  } else {

[ddorwin, 2015/05/04 22:46:02]

Now we complete pending GKRs whereas we didn't before. Is that right?

[jrummell, 2015/05/05 00:54:18]

Correct. The ECKPrefixedEncryptedMediaTest.InitializeCDMFail test was failing,
due to the extra time through Pepper before the CDM is reporting failure.

+    key_system_ = key_system;
+    security_origin_ = security_origin;
+    is_clear_key_ = IsClearKey(key_system) || IsExternalClearKey(key_system);
+    media_keys_ = cdm.Pass();
+
+    cdm_context_ready_cb.Run(media_keys_->GetCdmContext());
   }
 
-  key_system_ = key_system;
-  security_origin_ = security_origin;
-  is_clear_key_ = IsClearKey(key_system) || IsExternalClearKey(key_system);
-  media_keys_ = cdm.Pass();
-
-  cdm_context_ready_cb.Run(media_keys_->GetCdmContext());
-
   for (const auto& request : pending_requests_)
     GenerateKeyRequestInternal(request->init_data_type, request->init_data);
 
   pending_requests_.clear();
 }
 
 void ProxyDecryptor::GenerateKeyRequest(EmeInitDataType init_data_type,
                                         const uint8* init_data,
                                         int init_data_length) {
   std::vector<uint8> init_data_vector(init_data, init_data + init_data_length);
@@ skipping 271 matching lines @@
   bool is_persistent =
       session_type == PersistentSession || session_type == LoadSession;
   active_sessions_.insert(std::make_pair(session_id, is_persistent));
 
   // For LoadSession(), generate the KeyAdded event.
   if (session_type == LoadSession)
     GenerateKeyAdded(session_id);
 }
 
 }  // namespace media