EME: Handle NO_KEY and resume playback after key is added.

content/browser/android/browser_media_player_manager.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 "content/browser/android/browser_media_player_manager.h"
 
 #include "content/browser/android/content_view_core_impl.h"
 #include "content/browser/android/media_resource_getter_impl.h"
 #include "content/browser/web_contents/web_contents_view_android.h"
 #include "content/common/media/media_player_messages_android.h"
@@ skipping 456 matching lines @@
   MediaDrmBridge* drm_bridge = GetDrmBridge(media_keys_id);
   if (drm_bridge)
     drm_bridge->GenerateKeyRequest(type, &init_data[0], init_data.size());
 }
 
 void BrowserMediaPlayerManager::OnAddKey(int media_keys_id,
                                          const std::vector<uint8>& key,
                                          const std::vector<uint8>& init_data,
                                          const std::string& session_id) {
   MediaDrmBridge* drm_bridge = GetDrmBridge(media_keys_id);
-  if (drm_bridge) {
-    drm_bridge->AddKey(&key[0], key.size(), &init_data[0], init_data.size(),
-                       session_id);
-  }
+  if (!drm_bridge)
+    return;
+
+  drm_bridge->AddKey(&key[0], key.size(), &init_data[0], init_data.size(),
+                     session_id);
+  // In EME v0.1b MediaKeys lives in the media element. So the |media_keys_id|
+  // is the same as the |player_id|.
+  // TODO(xhwang): Separate |media_keys_id| and |player_id|.
+  MediaPlayerAndroid* player = GetPlayer(media_keys_id);
+  if (player)
+    player->OnKeyAdded();
 }
 
 void BrowserMediaPlayerManager::OnCancelKeyRequest(
     int media_keys_id,
     const std::string& session_id) {
   MediaDrmBridge* drm_bridge = GetDrmBridge(media_keys_id);
   if (drm_bridge)
     drm_bridge->CancelKeyRequest(session_id);
 }
 
@@ skipping 47 matching lines @@
   if (!player || !drm_bridge) {
     NOTREACHED() << "OnSetMediaKeys(): Player and MediaKeys must be present.";
     return;
   }
   // TODO(qinmin): add the logic to decide whether we should create the
   // fullscreen surface for EME lv1.
   player->SetDrmBridge(drm_bridge);
 }
 
 }  // namespace content