summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_prefs_unittest.cc
diff options
context:
space:
mode:
authorthomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-20 15:29:58 +0000
committerthomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-20 15:29:58 +0000
commit43d1eca41085dcebb8b015cf75a2e9a679674438 (patch)
treeed61ec0761c10f34a8a442c80077be94b900ccaf /chrome/browser/extensions/extension_prefs_unittest.cc
parent9c42a481ed4ef654568785145e143cb172f3e935 (diff)
downloadchromium_src-43d1eca41085dcebb8b015cf75a2e9a679674438.zip
chromium_src-43d1eca41085dcebb8b015cf75a2e9a679674438.tar.gz
chromium_src-43d1eca41085dcebb8b015cf75a2e9a679674438.tar.bz2
Revert 45028 - Factor out reading and writing of preferences into |PrefStore|.
In order to implement platformspecific policies, reading and writing preferences needs to be abstracted from the |PrefService|. The interface for that is now |PrefStore|, with an implementation |JsonPrefStore|, which stores the pref data in a JSON file. There is another implementation, |DummyPrefStore|, which doesn't store any persistent preferences, and is currently used for tests. Most of the changes are for using the new interface, which is |new PrefService(new JsonPrefStore(filename))| instead of |new PrefService(filename)|. BUG=40259 TEST=PrefServiceTest.*:PrefServiceSetValueTest.*:PrefMemberTest.*:JsonPrefStoreTest.* Review URL: http://codereview.chromium.org/1523023 TBR=bauerb@chromium.org Review URL: http://codereview.chromium.org/1682001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45038 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_prefs_unittest.cc')
-rw-r--r--chrome/browser/extensions/extension_prefs_unittest.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/browser/extensions/extension_prefs_unittest.cc b/chrome/browser/extensions/extension_prefs_unittest.cc
index 40ff72a..cd6c88a 100644
--- a/chrome/browser/extensions/extension_prefs_unittest.cc
+++ b/chrome/browser/extensions/extension_prefs_unittest.cc
@@ -7,7 +7,6 @@
#include "base/string_util.h"
#include "chrome/browser/chrome_thread.h"
#include "chrome/browser/extensions/extension_prefs.h"
-#include "chrome/browser/json_pref_store.h"
#include "chrome/browser/pref_service.h"
#include "chrome/common/extensions/extension_constants.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -21,8 +20,7 @@ class ExtensionPrefsTest : public testing::Test {
ExtensionPrefsTest() {
EXPECT_TRUE(temp_dir_.CreateUniqueTempDir());
FilePath preferences_file_ = temp_dir_.path().AppendASCII("Preferences");
- pref_service_.reset(new PrefService(
- new JsonPrefStore(preferences_file_)));
+ pref_service_.reset(new PrefService(preferences_file_));
ExtensionPrefs::RegisterUserPrefs(pref_service_.get());
CreateExtensionPrefs();
}