chrome/browser/content_settings/host_content_settings_map_unittest.cc - Issue 11570009: Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable.

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

Issue 11570009: Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge to head again, previous had unrelated broken win_rel test. Created 8 years 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/content_settings/host_content_settings_map.cc ('k') | chrome/browser/custom_handlers/protocol_handler_registry.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/host_content_settings_map_unittest.cc

diff --git a/chrome/browser/content_settings/host_content_settings_map_unittest.cc b/chrome/browser/content_settings/host_content_settings_map_unittest.cc

index 3c470c7a880bfb9e4140da8606176548826a84a2..646d3c1ca55a710cf53513df6e1f9886c244bfeb 100644

--- a/chrome/browser/content_settings/host_content_settings_map_unittest.cc

+++ b/chrome/browser/content_settings/host_content_settings_map_unittest.cc

@@ -824,7 +824,7 @@ TEST_F(HostContentSettingsMapTest, ManagedDefaultContentSetting) {

TestingProfile profile;

HostContentSettingsMap* host_content_settings_map =

profile.GetHostContentSettingsMap();

- TestingPrefService* prefs = profile.GetTestingPrefService();

+ TestingPrefServiceSyncable* prefs = profile.GetTestingPrefService();

EXPECT_EQ(CONTENT_SETTING_ALLOW,

host_content_settings_map->GetDefaultContentSetting(

@@ -862,7 +862,7 @@ TEST_F(HostContentSettingsMapTest,

TestingProfile profile;

HostContentSettingsMap* host_content_settings_map =

profile.GetHostContentSettingsMap();

- TestingPrefService* prefs = profile.GetTestingPrefService();

+ TestingPrefServiceSyncable* prefs = profile.GetTestingPrefService();

// Set pattern for JavaScript setting.

ContentSettingsPattern pattern =

@@ -898,7 +898,7 @@ TEST_F(HostContentSettingsMapTest,

TestingProfile profile;

HostContentSettingsMap* host_content_settings_map =

profile.GetHostContentSettingsMap();

- TestingPrefService* prefs = profile.GetTestingPrefService();

+ TestingPrefServiceSyncable* prefs = profile.GetTestingPrefService();

// Block all JavaScript.

host_content_settings_map->SetDefaultContentSetting(

@@ -943,7 +943,7 @@ TEST_F(HostContentSettingsMapTest, OverwrittenDefaultContentSetting) {

TestingProfile profile;

HostContentSettingsMap* host_content_settings_map =

profile.GetHostContentSettingsMap();

- TestingPrefService* prefs = profile.GetTestingPrefService();

+ TestingPrefServiceSyncable* prefs = profile.GetTestingPrefService();

// Set user defined default-content-setting for Cookies.

host_content_settings_map->SetDefaultContentSetting(

@@ -973,7 +973,7 @@ TEST_F(HostContentSettingsMapTest, SettingDefaultContentSettingsWhenManaged) {

TestingProfile profile;

HostContentSettingsMap* host_content_settings_map =

profile.GetHostContentSettingsMap();

- TestingPrefService* prefs = profile.GetTestingPrefService();

+ TestingPrefServiceSyncable* prefs = profile.GetTestingPrefService();

prefs->SetManagedPref(prefs::kManagedDefaultPluginsSetting,

Value::CreateIntegerValue(CONTENT_SETTING_ALLOW));

@@ -1049,7 +1049,7 @@ TEST_F(HostContentSettingsMapTest, ShouldAllowAllContent) {

TEST_F(HostContentSettingsMapTest, MigrateClearOnExit) {

TestingProfile profile;

- TestingPrefService* prefs = profile.GetTestingPrefService();

+ TestingPrefServiceSyncable* prefs = profile.GetTestingPrefService();

prefs->SetBoolean(prefs::kClearSiteDataOnExit, true);