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

Unified Diff: chrome/browser/content_settings/content_settings_browsertest.cc

Issue 2020573002: media: Check Widevine CDM registration and availability. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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 | « no previous file | chrome/browser/media/pepper_cdm_test_helper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/content_settings/content_settings_browsertest.cc
diff --git a/chrome/browser/content_settings/content_settings_browsertest.cc b/chrome/browser/content_settings/content_settings_browsertest.cc
index 5e8ed329e45b5d238ba4acd7ffd078a27352184d..0e627194705600d5f12900230e3baef7242955c4 100644
--- a/chrome/browser/content_settings/content_settings_browsertest.cc
+++ b/chrome/browser/content_settings/content_settings_browsertest.cc
@@ -34,6 +34,7 @@
#include "content/public/common/content_switches.h"
#include "content/public/test/browser_test_utils.h"
#include "content/public/test/test_utils.h"
+#include "media/cdm/cdm_paths.h"
#include "net/dns/mock_host_resolver.h"
#include "net/test/embedded_test_server/embedded_test_server.h"
#include "net/test/url_request/url_request_mock_http_job.h"
@@ -474,6 +475,11 @@ IN_PROC_BROWSER_TEST_F(PepperContentSettingsSpecialCasesPluginsBlockedTest,
#if defined(WIDEVINE_CDM_AVAILABLE) && !defined(OS_CHROMEOS)
IN_PROC_BROWSER_TEST_F(PepperContentSettingsSpecialCasesPluginsBlockedTest,
WidevineCdm) {
+ // Check that Widevine CDM is available and registered.
+ base::FilePath adapter_path =
+ GetPepperCdmPath(kWidevineCdmBaseDirectory, kWidevineCdmAdapterFileName);
+ EXPECT_TRUE(base::PathExists(adapter_path)) << adapter_path.MaybeAsASCII();
+ EXPECT_TRUE(IsPepperCdmRegistered(kWidevineCdmPluginMimeType));
RunLoadPepperPluginTest(kWidevineCdmPluginMimeType, true);
}
#endif // defined(WIDEVINE_CDM_AVAILABLE) && !defined(OS_CHROMEOS)
@@ -499,6 +505,11 @@ IN_PROC_BROWSER_TEST_F(PepperContentSettingsSpecialCasesJavaScriptBlockedTest,
#if defined(WIDEVINE_CDM_AVAILABLE)
IN_PROC_BROWSER_TEST_F(PepperContentSettingsSpecialCasesJavaScriptBlockedTest,
WidevineCdm) {
+ // Check that Widevine CDM is available and registered.
+ base::FilePath adapter_path =
+ GetPepperCdmPath(kWidevineCdmBaseDirectory, kWidevineCdmAdapterFileName);
+ EXPECT_TRUE(base::PathExists(adapter_path)) << adapter_path.MaybeAsASCII();
+ EXPECT_TRUE(IsPepperCdmRegistered(kWidevineCdmPluginMimeType));
RunJavaScriptBlockedTest("load_widevine_no_js.html", true);
}
#endif // defined(WIDEVINE_CDM_AVAILABLE)
« no previous file with comments | « no previous file | chrome/browser/media/pepper_cdm_test_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698