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..00cec73c2ae35bb54556e4087cd3b0b0fbbd79d5 100644 |
--- a/chrome/renderer/content_settings_observer_browsertest.cc |
+++ b/chrome/renderer/content_settings_observer_browsertest.cc |
@@ -107,6 +107,7 @@ TEST_F(ChromeRenderViewTest, JSBlockSentAfterPageLoad) { |
ContentSettingPatternSource(ContentSettingsPattern::Wildcard(), |
ContentSettingsPattern::Wildcard(), |
CONTENT_SETTING_BLOCK, |
+ base::Time(), |
std::string(), |
false)); |
ContentSettingsObserver* observer = ContentSettingsObserver::Get( |
@@ -186,6 +187,7 @@ TEST_F(ChromeRenderViewTest, ImagesBlockedByDefault) { |
ContentSettingPatternSource(ContentSettingsPattern::Wildcard(), |
ContentSettingsPattern::Wildcard(), |
CONTENT_SETTING_BLOCK, |
+ base::Time(), |
std::string(), |
false)); |
@@ -204,6 +206,7 @@ TEST_F(ChromeRenderViewTest, ImagesBlockedByDefault) { |
ContentSettingsPattern::Wildcard(), |
ContentSettingsPattern::FromString(mock_observer.image_origin_), |
CONTENT_SETTING_ALLOW, |
+ base::Time(), |
std::string(), |
false)); |
@@ -227,6 +230,7 @@ TEST_F(ChromeRenderViewTest, ImagesAllowedByDefault) { |
ContentSettingPatternSource(ContentSettingsPattern::Wildcard(), |
ContentSettingsPattern::Wildcard(), |
CONTENT_SETTING_ALLOW, |
+ base::Time(), |
std::string(), |
false)); |
@@ -245,6 +249,7 @@ TEST_F(ChromeRenderViewTest, ImagesAllowedByDefault) { |
ContentSettingsPattern::Wildcard(), |
ContentSettingsPattern::FromString(mock_observer.image_origin_), |
CONTENT_SETTING_BLOCK, |
+ base::Time(), |
std::string(), |
false)); |
EXPECT_CALL(mock_observer, |
@@ -262,6 +267,7 @@ TEST_F(ChromeRenderViewTest, ContentSettingsBlockScripts) { |
ContentSettingPatternSource(ContentSettingsPattern::Wildcard(), |
ContentSettingsPattern::Wildcard(), |
CONTENT_SETTING_BLOCK, |
+ base::Time(), |
std::string(), |
false)); |
@@ -299,6 +305,7 @@ TEST_F(ChromeRenderViewTest, ContentSettingsAllowScripts) { |
ContentSettingPatternSource(ContentSettingsPattern::Wildcard(), |
ContentSettingsPattern::Wildcard(), |
CONTENT_SETTING_ALLOW, |
+ base::Time(), |
std::string(), |
false)); |
@@ -337,7 +344,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 +375,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 +427,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()); |
@@ -442,6 +449,7 @@ TEST_F(ChromeRenderViewTest, ContentSettingsInterstitialPages) { |
ContentSettingPatternSource(ContentSettingsPattern::Wildcard(), |
ContentSettingsPattern::Wildcard(), |
CONTENT_SETTING_BLOCK, |
+ base::Time(), |
std::string(), |
false)); |
// Block images. |
@@ -451,6 +459,7 @@ TEST_F(ChromeRenderViewTest, ContentSettingsInterstitialPages) { |
ContentSettingPatternSource(ContentSettingsPattern::Wildcard(), |
ContentSettingsPattern::Wildcard(), |
CONTENT_SETTING_BLOCK, |
+ base::Time(), |
std::string(), |
false)); |
@@ -500,6 +509,7 @@ TEST_F(ChromeRenderViewTest, AutoplayContentSettings) { |
ContentSettingPatternSource(ContentSettingsPattern::Wildcard(), |
ContentSettingsPattern::Wildcard(), |
CONTENT_SETTING_ALLOW, |
+ base::Time(), |
std::string(), |
false)); |
@@ -517,6 +527,7 @@ TEST_F(ChromeRenderViewTest, AutoplayContentSettings) { |
ContentSettingsPattern::Wildcard(), |
ContentSettingsPattern::Wildcard(), |
CONTENT_SETTING_BLOCK, |
+ base::Time(), |
std::string(), |
false)); |