summaryrefslogtreecommitdiffstats
path: root/chrome/browser/pref_service_unittest.cc
diff options
context:
space:
mode:
authorpam@chromium.org <pam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-16 11:48:21 +0000
committerpam@chromium.org <pam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-16 11:48:21 +0000
commit8664dfb1f41cb9c51e50b3f7c4d78b24d29408d8 (patch)
treeb87113a3ed8f5594daf03d0d5a3134e504dcadd4 /chrome/browser/pref_service_unittest.cc
parent7c983cc803a9b4a9ada8a43c3091a0bf6be78418 (diff)
downloadchromium_src-8664dfb1f41cb9c51e50b3f7c4d78b24d29408d8.zip
chromium_src-8664dfb1f41cb9c51e50b3f7c4d78b24d29408d8.tar.gz
chromium_src-8664dfb1f41cb9c51e50b3f7c4d78b24d29408d8.tar.bz2
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
Diffstat (limited to 'chrome/browser/pref_service_unittest.cc')
-rw-r--r--chrome/browser/pref_service_unittest.cc11
1 files changed, 6 insertions, 5 deletions
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()) {}