From 8664dfb1f41cb9c51e50b3f7c4d78b24d29408d8 Mon Sep 17 00:00:00 2001 From: "pam@chromium.org" Date: Fri, 16 Jul 2010 11:48:21 +0000 Subject: Add a PrefStore for loading prefs from command-line switches. The first users are proxies and locale, for policies. BUG=49162 TEST=covered by unit tests Review URL: http://codereview.chromium.org/3025001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52650 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/pref_service_unittest.cc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'chrome/browser/pref_service_unittest.cc') diff --git a/chrome/browser/pref_service_unittest.cc b/chrome/browser/pref_service_unittest.cc index 591e00e..45b840d 100644 --- a/chrome/browser/pref_service_unittest.cc +++ b/chrome/browser/pref_service_unittest.cc @@ -64,7 +64,7 @@ class TestPrefObserver : public NotificationObserver { // TODO(port): port this test to POSIX. #if defined(OS_WIN) TEST(PrefServiceTest, LocalizedPrefs) { - PrefService prefs(new PrefValueStore(NULL, NULL, new DummyPrefStore(), + PrefService prefs(new PrefValueStore(NULL, NULL, NULL, new DummyPrefStore(), NULL)); const wchar_t kBoolean[] = L"boolean"; const wchar_t kInteger[] = L"integer"; @@ -88,7 +88,7 @@ TEST(PrefServiceTest, LocalizedPrefs) { #endif TEST(PrefServiceTest, NoObserverFire) { - PrefService prefs(new PrefValueStore(NULL, NULL, new DummyPrefStore(), + PrefService prefs(new PrefValueStore(NULL, NULL, NULL, new DummyPrefStore(), NULL)); const wchar_t pref_name[] = L"homepage"; @@ -124,7 +124,7 @@ TEST(PrefServiceTest, NoObserverFire) { } TEST(PrefServiceTest, HasPrefPath) { - PrefService prefs(new PrefValueStore(NULL, NULL, new DummyPrefStore(), + PrefService prefs(new PrefValueStore(NULL, NULL, NULL, new DummyPrefStore(), NULL)); const wchar_t path[] = L"fake.path"; @@ -149,7 +149,7 @@ TEST(PrefServiceTest, Observers) { dict->SetString(pref_name, std::string("http://www.cnn.com")); DummyPrefStore* pref_store = new DummyPrefStore(); pref_store->set_prefs(dict); - PrefService prefs(new PrefValueStore(NULL, NULL, pref_store, NULL)); + PrefService prefs(new PrefValueStore(NULL, NULL, NULL, pref_store, NULL)); prefs.RegisterStringPref(pref_name, ""); const std::string new_pref_value("http://www.google.com/"); @@ -190,7 +190,8 @@ class PrefServiceSetValueTest : public testing::Test { static const char value_[]; PrefServiceSetValueTest() - : prefs_(new PrefValueStore(NULL, NULL, new DummyPrefStore(), NULL)), + : prefs_(new PrefValueStore(NULL, NULL, NULL, new DummyPrefStore(), + NULL)), name_string_(name_), null_value_(Value::CreateNullValue()) {} -- cgit v1.1