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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/renderer/content_settings_observer_browsertest.cc

Issue 2812113004: Write last_modified date to Content Settings in the PrefProvider (Closed)
Patch Set: fix comments Created 3 years, 8 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
« chrome/browser/content_settings/host_content_settings_map_factory.cc ('K') | « chrome/common/chrome_features.cc ('k') | components/content_settings/core/browser/content_settings_default_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/content_settings_observer_browsertest.cc
diff --git a/chrome/renderer/content_settings_observer_browsertest.cc b/chrome/renderer/content_settings_observer_browsertest.cc
index daa026988567e768309eaee6ee8fc8a652aac6e1..76c162b1c9632784200d2b72b8e1b117485f9065 100644
--- a/chrome/renderer/content_settings_observer_browsertest.cc
+++ b/chrome/renderer/content_settings_observer_browsertest.cc
@@ -103,12 +103,9 @@ TEST_F(ChromeRenderViewTest, JSBlockSentAfterPageLoad) {
RendererContentSettingRules content_setting_rules;
ContentSettingsForOneType& script_setting_rules =
content_setting_rules.script_rules;
- script_setting_rules.push_back(
- ContentSettingPatternSource(ContentSettingsPattern::Wildcard(),
- ContentSettingsPattern::Wildcard(),
- CONTENT_SETTING_BLOCK,
- std::string(),
- false));
+ script_setting_rules.push_back(ContentSettingPatternSource(
+ ContentSettingsPattern::Wildcard(), ContentSettingsPattern::Wildcard(),
+ CONTENT_SETTING_BLOCK, base::Time(), std::string(), false));
ContentSettingsObserver* observer = ContentSettingsObserver::Get(
view_->GetMainRenderFrame());
observer->SetContentSettingRules(&content_setting_rules);
@@ -182,12 +179,9 @@ TEST_F(ChromeRenderViewTest, ImagesBlockedByDefault) {
RendererContentSettingRules content_setting_rules;
ContentSettingsForOneType& image_setting_rules =
content_setting_rules.image_rules;
- image_setting_rules.push_back(
- ContentSettingPatternSource(ContentSettingsPattern::Wildcard(),
- ContentSettingsPattern::Wildcard(),
- CONTENT_SETTING_BLOCK,
- std::string(),
- false));
+ image_setting_rules.push_back(ContentSettingPatternSource(
+ ContentSettingsPattern::Wildcard(), ContentSettingsPattern::Wildcard(),
+ CONTENT_SETTING_BLOCK, base::Time(), std::string(), false));
ContentSettingsObserver* observer = ContentSettingsObserver::Get(
view_->GetMainRenderFrame());
@@ -203,9 +197,7 @@ TEST_F(ChromeRenderViewTest, ImagesBlockedByDefault) {
ContentSettingPatternSource(
ContentSettingsPattern::Wildcard(),
ContentSettingsPattern::FromString(mock_observer.image_origin_),
- CONTENT_SETTING_ALLOW,
- std::string(),
- false));
+ CONTENT_SETTING_ALLOW, base::Time(), std::string(), false));
EXPECT_CALL(mock_observer, OnContentBlocked(CONTENT_SETTINGS_TYPE_IMAGES,
base::string16())).Times(0);
@@ -223,12 +215,9 @@ TEST_F(ChromeRenderViewTest, ImagesAllowedByDefault) {
RendererContentSettingRules content_setting_rules;
ContentSettingsForOneType& image_setting_rules =
content_setting_rules.image_rules;
- image_setting_rules.push_back(
- ContentSettingPatternSource(ContentSettingsPattern::Wildcard(),
- ContentSettingsPattern::Wildcard(),
- CONTENT_SETTING_ALLOW,
- std::string(),
- false));
+ image_setting_rules.push_back(ContentSettingPatternSource(
+ ContentSettingsPattern::Wildcard(), ContentSettingsPattern::Wildcard(),
+ CONTENT_SETTING_ALLOW, base::Time(), std::string(), false));
ContentSettingsObserver* observer =
ContentSettingsObserver::Get(view_->GetMainRenderFrame());
@@ -244,9 +233,7 @@ TEST_F(ChromeRenderViewTest, ImagesAllowedByDefault) {
ContentSettingPatternSource(
ContentSettingsPattern::Wildcard(),
ContentSettingsPattern::FromString(mock_observer.image_origin_),
- CONTENT_SETTING_BLOCK,
- std::string(),
- false));
+ CONTENT_SETTING_BLOCK, base::Time(), std::string(), false));
EXPECT_CALL(mock_observer,
OnContentBlocked(CONTENT_SETTINGS_TYPE_IMAGES, base::string16()));
EXPECT_FALSE(observer->AllowImage(true, mock_observer.image_url_));
@@ -258,12 +245,9 @@ TEST_F(ChromeRenderViewTest, ContentSettingsBlockScripts) {
RendererContentSettingRules content_setting_rules;
ContentSettingsForOneType& script_setting_rules =
content_setting_rules.script_rules;
- script_setting_rules.push_back(
- ContentSettingPatternSource(ContentSettingsPattern::Wildcard(),
- ContentSettingsPattern::Wildcard(),
- CONTENT_SETTING_BLOCK,
- std::string(),
- false));
+ script_setting_rules.push_back(ContentSettingPatternSource(
+ ContentSettingsPattern::Wildcard(), ContentSettingsPattern::Wildcard(),
+ CONTENT_SETTING_BLOCK, base::Time(), std::string(), false));
ContentSettingsObserver* observer =
ContentSettingsObserver::Get(view_->GetMainRenderFrame());
@@ -295,12 +279,9 @@ TEST_F(ChromeRenderViewTest, ContentSettingsAllowScripts) {
RendererContentSettingRules content_setting_rules;
ContentSettingsForOneType& script_setting_rules =
content_setting_rules.script_rules;
- script_setting_rules.push_back(
- ContentSettingPatternSource(ContentSettingsPattern::Wildcard(),
- ContentSettingsPattern::Wildcard(),
- CONTENT_SETTING_ALLOW,
- std::string(),
- false));
+ script_setting_rules.push_back(ContentSettingPatternSource(
+ ContentSettingsPattern::Wildcard(), ContentSettingsPattern::Wildcard(),
+ CONTENT_SETTING_ALLOW, base::Time(), std::string(), false));
ContentSettingsObserver* observer =
ContentSettingsObserver::Get(view_->GetMainRenderFrame());
@@ -337,7 +318,7 @@ TEST_F(ChromeRenderViewTest, ContentSettingsNoscriptTag) {
content_setting_rules.script_rules;
script_setting_rules.push_back(ContentSettingPatternSource(
ContentSettingsPattern::Wildcard(), ContentSettingsPattern::Wildcard(),
- CONTENT_SETTING_BLOCK, std::string(), false));
+ CONTENT_SETTING_BLOCK, base::Time(), std::string(), false));
ContentSettingsObserver* observer =
ContentSettingsObserver::Get(view_->GetMainRenderFrame());
@@ -368,7 +349,7 @@ TEST_F(ChromeRenderViewTest, ContentSettingsNoscriptTag) {
script_setting_rules.clear();
script_setting_rules.push_back(ContentSettingPatternSource(
ContentSettingsPattern::Wildcard(), ContentSettingsPattern::Wildcard(),
- CONTENT_SETTING_ALLOW, std::string(), false));
+ CONTENT_SETTING_ALLOW, base::Time(), std::string(), false));
observer->SetContentSettingRules(&content_setting_rules);
// 4. Reload the page.
@@ -420,7 +401,7 @@ TEST_F(ChromeRenderViewTest, ContentSettingsSameDocumentNavigation) {
content_setting_rules.script_rules;
script_setting_rules.push_back(ContentSettingPatternSource(
ContentSettingsPattern::Wildcard(), ContentSettingsPattern::Wildcard(),
- CONTENT_SETTING_BLOCK, std::string(), false));
+ CONTENT_SETTING_BLOCK, base::Time(), std::string(), false));
ContentSettingsObserver* observer =
ContentSettingsObserver::Get(view_->GetMainRenderFrame());
@@ -438,21 +419,15 @@ TEST_F(ChromeRenderViewTest, ContentSettingsInterstitialPages) {
RendererContentSettingRules content_setting_rules;
ContentSettingsForOneType& script_setting_rules =
content_setting_rules.script_rules;
- script_setting_rules.push_back(
- ContentSettingPatternSource(ContentSettingsPattern::Wildcard(),
- ContentSettingsPattern::Wildcard(),
- CONTENT_SETTING_BLOCK,
- std::string(),
- false));
+ script_setting_rules.push_back(ContentSettingPatternSource(
+ ContentSettingsPattern::Wildcard(), ContentSettingsPattern::Wildcard(),
+ CONTENT_SETTING_BLOCK, base::Time(), std::string(), false));
// Block images.
ContentSettingsForOneType& image_setting_rules =
content_setting_rules.image_rules;
- image_setting_rules.push_back(
- ContentSettingPatternSource(ContentSettingsPattern::Wildcard(),
- ContentSettingsPattern::Wildcard(),
- CONTENT_SETTING_BLOCK,
- std::string(),
- false));
+ image_setting_rules.push_back(ContentSettingPatternSource(
+ ContentSettingsPattern::Wildcard(), ContentSettingsPattern::Wildcard(),
+ CONTENT_SETTING_BLOCK, base::Time(), std::string(), false));
ContentSettingsObserver* observer =
ContentSettingsObserver::Get(view_->GetMainRenderFrame());
@@ -496,12 +471,9 @@ TEST_F(ChromeRenderViewTest, AutoplayContentSettings) {
RendererContentSettingRules content_setting_rules;
ContentSettingsForOneType& autoplay_setting_rules =
content_setting_rules.autoplay_rules;
- autoplay_setting_rules.push_back(
- ContentSettingPatternSource(ContentSettingsPattern::Wildcard(),
- ContentSettingsPattern::Wildcard(),
- CONTENT_SETTING_ALLOW,
- std::string(),
- false));
+ autoplay_setting_rules.push_back(ContentSettingPatternSource(
+ ContentSettingsPattern::Wildcard(), ContentSettingsPattern::Wildcard(),
+ CONTENT_SETTING_ALLOW, base::Time(), std::string(), false));
ContentSettingsObserver* observer =
ContentSettingsObserver::Get(view_->GetMainRenderFrame());
@@ -513,12 +485,10 @@ TEST_F(ChromeRenderViewTest, AutoplayContentSettings) {
// Add rule to block autoplay.
autoplay_setting_rules.insert(
autoplay_setting_rules.begin(),
- ContentSettingPatternSource(
- ContentSettingsPattern::Wildcard(),
- ContentSettingsPattern::Wildcard(),
- CONTENT_SETTING_BLOCK,
- std::string(),
- false));
+ ContentSettingPatternSource(ContentSettingsPattern::Wildcard(),
+ ContentSettingsPattern::Wildcard(),
+ CONTENT_SETTING_BLOCK, base::Time(),
+ std::string(), false));
EXPECT_FALSE(observer->AllowAutoplay(true));
::testing::Mock::VerifyAndClearExpectations(&observer);
« chrome/browser/content_settings/host_content_settings_map_factory.cc ('K') | « chrome/common/chrome_features.cc ('k') | components/content_settings/core/browser/content_settings_default_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698