Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1138)

Unified Diff: media/base/android/media_drm_bridge_unittest.cc

Issue 1341883003: Prepare MediaDrmBridge to work with MediaCodecPlayer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bug526755
Patch Set: Fixed MediaDrmBridgeTest unit tests Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/android/media_drm_bridge.cc ('k') | media/base/android/media_player_android.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/android/media_drm_bridge_unittest.cc
diff --git a/media/base/android/media_drm_bridge_unittest.cc b/media/base/android/media_drm_bridge_unittest.cc
index e4c0800030a57af1cb9aa1ceef1655cfcc3c8c5d..f215a425a5eec836585de1e132aaf76bed58cc5f 100644
--- a/media/base/android/media_drm_bridge_unittest.cc
+++ b/media/base/android/media_drm_bridge_unittest.cc
@@ -5,6 +5,7 @@
#include "base/android/build_info.h"
#include "base/basictypes.h"
#include "base/logging.h"
+#include "base/message_loop/message_loop.h"
#include "media/base/android/media_drm_bridge.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -76,17 +77,20 @@ TEST(MediaDrmBridgeTest, IsKeySystemSupported_InvalidKeySystem) {
}
TEST(MediaDrmBridgeTest, CreateWithoutSessionSupport_Widevine) {
+ base::MessageLoop message_loop_;
EXPECT_TRUE_IF_WIDEVINE_AVAILABLE(
MediaDrmBridge::CreateWithoutSessionSupport(kWidevineKeySystem));
}
// Invalid key system is NOT supported regardless whether MediaDrm is available.
TEST(MediaDrmBridgeTest, CreateWithoutSessionSupport_InvalidKeySystem) {
+ base::MessageLoop message_loop_;
EXPECT_FALSE(MediaDrmBridge::CreateWithoutSessionSupport(kInvalidKeySystem));
}
TEST(MediaDrmBridgeTest, SetSecurityLevel_Widevine) {
- scoped_ptr<MediaDrmBridge> media_drm_bridge =
+ base::MessageLoop message_loop_;
+ scoped_ptr<MediaDrmBridge, BrowserCdmDeleter> media_drm_bridge =
MediaDrmBridge::CreateWithoutSessionSupport(kWidevineKeySystem);
EXPECT_TRUE_IF_WIDEVINE_AVAILABLE(media_drm_bridge);
if (!media_drm_bridge)
« no previous file with comments | « media/base/android/media_drm_bridge.cc ('k') | media/base/android/media_player_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698