| 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 5bbed1f469ed84c29499ae8240ffd302fb43ca42..b05de2ee4902c82ea74273d70b6bb1dad7707162 100644
|
| --- a/chrome/renderer/content_settings_observer_browsertest.cc
|
| +++ b/chrome/renderer/content_settings_observer_browsertest.cc
|
| @@ -2,6 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| +#include "chrome/common/chrome_content_settings_client.h"
|
| #include "chrome/common/content_settings.h"
|
| #include "chrome/common/render_messages.h"
|
| #include "chrome/renderer/content_settings_observer.h"
|
| @@ -194,11 +195,13 @@ TEST_F(ChromeRenderViewTest, ImagesBlockedByDefault) {
|
| ::testing::Mock::VerifyAndClearExpectations(&observer);
|
|
|
| // Create an exception which allows the image.
|
| + content_settings::ChromeContentSettingsClient client;
|
| image_setting_rules.insert(
|
| image_setting_rules.begin(),
|
| ContentSettingPatternSource(
|
| ContentSettingsPattern::Wildcard(),
|
| - ContentSettingsPattern::FromString(mock_observer.image_origin_),
|
| + ContentSettingsPattern::FromString(&client,
|
| + mock_observer.image_origin_),
|
| CONTENT_SETTING_ALLOW,
|
| std::string(),
|
| false));
|
| @@ -237,11 +240,13 @@ TEST_F(ChromeRenderViewTest, ImagesAllowedByDefault) {
|
| ::testing::Mock::VerifyAndClearExpectations(&observer);
|
|
|
| // Create an exception which blocks the image.
|
| + content_settings::ChromeContentSettingsClient client;
|
| image_setting_rules.insert(
|
| image_setting_rules.begin(),
|
| ContentSettingPatternSource(
|
| ContentSettingsPattern::Wildcard(),
|
| - ContentSettingsPattern::FromString(mock_observer.image_origin_),
|
| + ContentSettingsPattern::FromString(&client,
|
| + mock_observer.image_origin_),
|
| CONTENT_SETTING_BLOCK,
|
| std::string(),
|
| false));
|
|
|