diff options
| author | qinmin@chromium.org <qinmin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-11 23:02:54 +0000 |
|---|---|---|
| committer | qinmin@chromium.org <qinmin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-11 23:02:54 +0000 |
| commit | e617613625f7a368c9f4c198affe473cfa4f2819 (patch) | |
| tree | 2c6652803faf30b4cc358d6d33615361e8bfa538 /content | |
| parent | 35e02840bd451d4f8d9e75d72523e5d667b6ce3f (diff) | |
| download | chromium_src-e617613625f7a368c9f4c198affe473cfa4f2819.zip chromium_src-e617613625f7a368c9f4c198affe473cfa4f2819.tar.gz chromium_src-e617613625f7a368c9f4c198affe473cfa4f2819.tar.bz2 | |
DCHECK that MediaDrmBridge::Create() should not return NULL
This call should be called after IsSupportedKeySystem（）， so it should not return NULL
BUG=163552
Review URL: https://chromiumcodereview.appspot.com/19010002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211244 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/android/media_player_manager_impl.cc | 5 | ||||
| -rw-r--r-- | content/browser/android/media_player_manager_impl.h | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/content/browser/android/media_player_manager_impl.cc b/content/browser/android/media_player_manager_impl.cc index f114c6d..a725b56 100644 --- a/content/browser/android/media_player_manager_impl.cc +++ b/content/browser/android/media_player_manager_impl.cc @@ -507,7 +507,10 @@ void MediaPlayerManagerImpl::RemovePlayer(int player_id) { void MediaPlayerManagerImpl::AddDrmBridge(int media_keys_id, const std::vector<uint8>& uuid) { DCHECK(!GetDrmBridge(media_keys_id)); - drm_bridges_.push_back(MediaDrmBridge::Create(media_keys_id, uuid, this)); + scoped_ptr<MediaDrmBridge> drm_bridge( + MediaDrmBridge::Create(media_keys_id, uuid, this)); + DCHECK(drm_bridge) << "failed to create drm bridge. "; + drm_bridges_.push_back(drm_bridge.release()); } void MediaPlayerManagerImpl::RemoveDrmBridge(int media_keys_id) { diff --git a/content/browser/android/media_player_manager_impl.h b/content/browser/android/media_player_manager_impl.h index 98fcc42..571dc27 100644 --- a/content/browser/android/media_player_manager_impl.h +++ b/content/browser/android/media_player_manager_impl.h @@ -148,7 +148,7 @@ class CONTENT_EXPORT MediaPlayerManagerImpl // Removes the player with the specified id. void RemovePlayer(int player_id); - // Add a new DrmBridge for the given |uuid| and |media_keys_id|. + // Add a new MediaDrmBridge for the given |uuid| and |media_keys_id|. void AddDrmBridge(int media_keys_id, const std::vector<uint8>& uuid); // Removes the DRM bridge with the specified id. |