Support creating secure decoder in MediaCodecBridge.

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 498 matching lines @@
     }
   }
 }
 
 void BrowserMediaPlayerManager::AddDrmBridge(int media_keys_id,
                                              const std::vector<uint8>& uuid) {
   DCHECK(!GetDrmBridge(media_keys_id));
   // TODO(qinmin): Pass the security level to MediaDrmBridge instead of using
   // the default L3.
   scoped_ptr<MediaDrmBridge> drm_bridge(
-      MediaDrmBridge::Create(media_keys_id, uuid, "L3", this));
-  DCHECK(drm_bridge) << "failed to create drm bridge. ";
+      MediaDrmBridge::Create(media_keys_id, uuid, "L1", this));

[xhwang, 2013/09/05 21:28:00]

I'll revert this change after the test is done.

+  if (!drm_bridge) {
+    DVLOG(1) << "failed to create drm bridge.";
+    return;
+  }
+
   drm_bridges_.push_back(drm_bridge.release());
 }
 
 void BrowserMediaPlayerManager::RemoveDrmBridge(int media_keys_id) {
   for (ScopedVector<MediaDrmBridge>::iterator it = drm_bridges_.begin();
       it != drm_bridges_.end(); ++it) {
     if ((*it)->media_keys_id() == media_keys_id) {
       drm_bridges_.erase(it);
       break;
     }
   }
 }
 
 void BrowserMediaPlayerManager::OnSetMediaKeys(int player_id,
                                                int media_keys_id) {
   MediaPlayerAndroid* player = GetPlayer(player_id);
   MediaDrmBridge* drm_bridge = GetDrmBridge(media_keys_id);
   if (!player || !drm_bridge) {
-    NOTREACHED() << "OnSetMediaKeys(): Player and MediaKeys must be present.";
+    DVLOG(1) << "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