Initialize the CDM asynchronously

media/cdm/proxy_decryptor.cc

Index: media/cdm/proxy_decryptor.cc
diff --git a/media/cdm/proxy_decryptor.cc b/media/cdm/proxy_decryptor.cc
index c30cb837f8be46732740419152cbc15a7e33cd4a..b8ba19c5ebc05994e93e20f2056ed7d9e93ed1e7 100644
--- a/media/cdm/proxy_decryptor.cc
+++ b/media/cdm/proxy_decryptor.cc
@@ -94,15 +94,14 @@ void ProxyDecryptor::OnCdmCreated(const std::string& key_system,
 
   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();
 
-  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());
+    cdm_context_ready_cb.Run(media_keys_->GetCdmContext());
+  }
 
   for (const auto& request : pending_requests_)
     GenerateKeyRequestInternal(request->init_data_type, request->init_data);