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

Unified Diff: chrome/browser/content_settings/content_settings_policy_provider_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/content_settings_policy_provider.cc ('k') | chrome/browser/content_settings/content_settings_pref_provider.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/content_settings_policy_provider_unittest.cc

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

index 04f8011a2bc0a33e7774049609e1be6b7753a5fe..a2ffa019eb3e854845281b59ef62bf671766522f 100644

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

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

@@ -47,7 +47,7 @@ class PolicyProviderTest : public testing::Test {

TEST_F(PolicyProviderTest, DefaultGeolocationContentSetting) {

TestingProfile profile;

- TestingPrefService* prefs = profile.GetTestingPrefService();

+ TestingPrefServiceSyncable* prefs = profile.GetTestingPrefService();

PolicyProvider provider(prefs);

Rules rules;

@@ -81,7 +81,7 @@ TEST_F(PolicyProviderTest, DefaultGeolocationContentSetting) {

TEST_F(PolicyProviderTest, ManagedDefaultContentSettings) {

TestingProfile profile;

- TestingPrefService* prefs = profile.GetTestingPrefService();

+ TestingPrefServiceSyncable* prefs = profile.GetTestingPrefService();

PolicyProvider provider(prefs);

prefs->SetManagedPref(prefs::kManagedDefaultPluginsSetting,

@@ -108,7 +108,7 @@ TEST_F(PolicyProviderTest, ManagedDefaultContentSettings) {

// if the managed setting is removed.

TEST_F(PolicyProviderTest, ObserveManagedSettingsChange) {

TestingProfile profile;

- TestingPrefService* prefs = profile.GetTestingPrefService();

+ TestingPrefServiceSyncable* prefs = profile.GetTestingPrefService();

PolicyProvider provider(prefs);

MockObserver mock_observer;

@@ -135,7 +135,7 @@ TEST_F(PolicyProviderTest, ObserveManagedSettingsChange) {

TEST_F(PolicyProviderTest, GettingManagedContentSettings) {

TestingProfile profile;

- TestingPrefService* prefs = profile.GetTestingPrefService();

+ TestingPrefServiceSyncable* prefs = profile.GetTestingPrefService();

ListValue* value = new ListValue();

value->Append(Value::CreateStringValue("[*.]google.com"));

@@ -193,7 +193,7 @@ TEST_F(PolicyProviderTest, GettingManagedContentSettings) {

TEST_F(PolicyProviderTest, ResourceIdentifier) {

TestingProfile profile;

- TestingPrefService* prefs = profile.GetTestingPrefService();

+ TestingPrefServiceSyncable* prefs = profile.GetTestingPrefService();

ListValue* value = new ListValue();

value->Append(Value::CreateStringValue("[*.]google.com"));

@@ -227,7 +227,7 @@ TEST_F(PolicyProviderTest, ResourceIdentifier) {

TEST_F(PolicyProviderTest, AutoSelectCertificateList) {

TestingProfile profile;

- TestingPrefService* prefs = profile.GetTestingPrefService();

+ TestingPrefServiceSyncable* prefs = profile.GetTestingPrefService();

PolicyProvider provider(prefs);

GURL google_url("https://mail.google.com");