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

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

Issue 1427183002: Move MediaDrmBridge provision communication to native side. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: AndroidCdmFactory use a fetcher factory instead of a fetcher; addressed more comments Created 5 years, 1 month 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
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 233dc75b04939035ff99d18128bb1b17a57090d4..154d3da6b1e77f9550d5b692932b74f7decbbc3f 100644
--- a/media/base/android/media_drm_bridge_unittest.cc
+++ b/media/base/android/media_drm_bridge_unittest.cc
@@ -7,6 +7,7 @@
#include "base/logging.h"
#include "base/message_loop/message_loop.h"
#include "media/base/android/media_drm_bridge.h"
+#include "media/base/android/provision_fetcher.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.
@@ -42,6 +43,21 @@ static bool IsKeySystemSupportedWithType(
container_mime_type);
}
+namespace {
+// Mock ProvisionFetcher.
+class MockProvisionFetcher : public ProvisionFetcher {
+ public:
+ void Retrieve(const std::string& default_url,
+ const std::string& request_data,
+ const ResponseCB& response_cb) override {}
+
+ static scoped_ptr<ProvisionFetcher> Create() {
+ return scoped_ptr<ProvisionFetcher>(new MockProvisionFetcher);
+ }
+};
+
+} // namespace (anonymous)
+
TEST(MediaDrmBridgeTest, IsKeySystemSupported_Widevine) {
// TODO(xhwang): Enable when b/13564917 is fixed.
// EXPECT_TRUE_IF_AVAILABLE(
@@ -78,20 +94,22 @@ TEST(MediaDrmBridgeTest, IsKeySystemSupported_InvalidKeySystem) {
TEST(MediaDrmBridgeTest, CreateWithoutSessionSupport_Widevine) {
base::MessageLoop message_loop_;
- EXPECT_TRUE_IF_WIDEVINE_AVAILABLE(
- MediaDrmBridge::CreateWithoutSessionSupport(kWidevineKeySystem));
+ EXPECT_TRUE_IF_WIDEVINE_AVAILABLE(MediaDrmBridge::CreateWithoutSessionSupport(
+ kWidevineKeySystem, MockProvisionFetcher::Create().Pass()));
}
// Invalid key system is NOT supported regardless whether MediaDrm is available.
TEST(MediaDrmBridgeTest, CreateWithoutSessionSupport_InvalidKeySystem) {
base::MessageLoop message_loop_;
- EXPECT_FALSE(MediaDrmBridge::CreateWithoutSessionSupport(kInvalidKeySystem));
+ EXPECT_FALSE(MediaDrmBridge::CreateWithoutSessionSupport(
+ kInvalidKeySystem, MockProvisionFetcher::Create().Pass()));
}
TEST(MediaDrmBridgeTest, SetSecurityLevel_Widevine) {
base::MessageLoop message_loop_;
scoped_refptr<MediaDrmBridge> media_drm_bridge =
- MediaDrmBridge::CreateWithoutSessionSupport(kWidevineKeySystem);
+ MediaDrmBridge::CreateWithoutSessionSupport(
+ kWidevineKeySystem, MockProvisionFetcher::Create().Pass());
EXPECT_TRUE_IF_WIDEVINE_AVAILABLE(media_drm_bridge);
if (!media_drm_bridge)
return;

Powered by Google App Engine
This is Rietveld 408576698