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

Unified Diff: chrome/browser/plugins/flash_download_interception_unittest.cc

Issue 2340123002: [HBD] Only use Flash Download interception for DETECT content setting. (Closed)
Patch Set: update owners file Created 4 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 | « chrome/browser/plugins/flash_download_interception.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/plugins/flash_download_interception_unittest.cc
diff --git a/chrome/browser/plugins/flash_download_interception_unittest.cc b/chrome/browser/plugins/flash_download_interception_unittest.cc
index bace9513958ec658134e48340847605b7456f08b..065fd7057160c69cd9891fe7096eb7f186161392 100644
--- a/chrome/browser/plugins/flash_download_interception_unittest.cc
+++ b/chrome/browser/plugins/flash_download_interception_unittest.cc
@@ -5,8 +5,11 @@
#include "chrome/browser/plugins/flash_download_interception.h"
#include "base/test/scoped_feature_list.h"
+#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
#include "chrome/common/chrome_features.h"
#include "chrome/test/base/chrome_render_view_host_test_harness.h"
+#include "chrome/test/base/testing_profile.h"
+#include "components/content_settings/core/browser/host_content_settings_map.h"
#include "content/public/browser/navigation_handle.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "url/gurl.h"
@@ -46,7 +49,7 @@ TEST_F(FlashDownloadInterceptionTest, PreferHtmlOverPluginsOff) {
EXPECT_EQ(nullptr, throttle);
}
-TEST_F(FlashDownloadInterceptionTest, PreferHtmlOverPluginsOn) {
+TEST_F(FlashDownloadInterceptionTest, DownloadUrlVariations) {
std::unique_ptr<NavigationThrottle> throttle;
std::unique_ptr<NavigationHandle> flash_slash_navigation_handle =
NavigationHandle::CreateNavigationHandleForTesting(
@@ -106,3 +109,40 @@ TEST_F(FlashDownloadInterceptionTest, PreferHtmlOverPluginsOn) {
example_flash_navigation_handle.get());
EXPECT_EQ(nullptr, throttle);
}
+
+TEST_F(FlashDownloadInterceptionTest, OnlyInterceptOnDetectContentSetting) {
+ base::test::ScopedFeatureList feature_list;
+ feature_list.InitAndEnableFeature(features::kPreferHtmlOverPlugins);
+
+ flash_navigation_handle_->CallWillStartRequestForTesting(
+ true, content::Referrer(), true, ui::PAGE_TRANSITION_LINK, false);
+
+ // Default Setting (which is DETECT)
+ std::unique_ptr<NavigationThrottle> throttle =
+ FlashDownloadInterception::MaybeCreateThrottleFor(
+ flash_navigation_handle_.get());
+ EXPECT_NE(nullptr, throttle);
+ ASSERT_EQ(NavigationThrottle::CANCEL_AND_IGNORE,
+ throttle->WillStartRequest());
+
+ // ALLOW and BLOCK Settings
+ HostContentSettingsMap* map =
+ HostContentSettingsMapFactory::GetForProfile(profile());
+ map->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_PLUGINS,
+ CONTENT_SETTING_ALLOW);
+ EXPECT_EQ(nullptr, FlashDownloadInterception::MaybeCreateThrottleFor(
+ flash_navigation_handle_.get()));
+ map->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_PLUGINS,
+ CONTENT_SETTING_BLOCK);
+ EXPECT_EQ(nullptr, FlashDownloadInterception::MaybeCreateThrottleFor(
+ flash_navigation_handle_.get()));
+
+ // Explicit DETECT
+ map->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_PLUGINS,
+ CONTENT_SETTING_DETECT_IMPORTANT_CONTENT);
+ throttle = FlashDownloadInterception::MaybeCreateThrottleFor(
+ flash_navigation_handle_.get());
+ EXPECT_NE(nullptr, throttle);
+ ASSERT_EQ(NavigationThrottle::CANCEL_AND_IGNORE,
+ throttle->WillStartRequest());
+}
« no previous file with comments | « chrome/browser/plugins/flash_download_interception.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698