Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1011)

Unified Diff: chrome/browser/extensions/test_extension_prefs.h

Issue 108643002: ABANDONED: Remove Chrome dependencies from TestExtensionPrefs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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
Index: chrome/browser/extensions/test_extension_prefs.h
diff --git a/chrome/browser/extensions/test_extension_prefs.h b/chrome/browser/extensions/test_extension_prefs.h
index 62320890604255678c481e2828f799847d8bb373..2d82842fda0c755229c0ce1666c0571fa466f918 100644
--- a/chrome/browser/extensions/test_extension_prefs.h
+++ b/chrome/browser/extensions/test_extension_prefs.h
@@ -18,6 +18,7 @@ class PrefServiceSyncable;
namespace base {
class DictionaryValue;
+class PrefServiceFactory;
class SequencedTaskRunner;
}
@@ -33,7 +34,10 @@ class ExtensionPrefs;
// in tests.
class TestExtensionPrefs {
public:
- explicit TestExtensionPrefs(base::SequencedTaskRunner* task_runner);
+ // Takes ownership of and uses |custom_pref_service_factory| if non-NULL;
+ // uses a standard base::PrefServiceFactory otherwise.
+ TestExtensionPrefs(base::SequencedTaskRunner* task_runner,
+ base::PrefServiceFactory* custom_pref_service_factory);
virtual ~TestExtensionPrefs();
ExtensionPrefs* prefs() { return prefs_.get(); }
@@ -77,8 +81,6 @@ class TestExtensionPrefs {
// assigned.
std::string AddExtensionAndReturnId(std::string name);
- PrefService* CreateIncognitoPrefService() const;
-
// Allows disabling the loading of preferences of extensions. Becomes
// active after calling RecreateExtensionPrefs(). Defaults to false.
void set_extensions_disabled(bool extensions_disabled);
@@ -87,8 +89,9 @@ class TestExtensionPrefs {
base::ScopedTempDir temp_dir_;
base::FilePath preferences_file_;
base::FilePath extensions_dir_;
+ scoped_ptr<base::PrefServiceFactory> pref_service_factory_;
scoped_refptr<user_prefs::PrefRegistrySyncable> pref_registry_;
- scoped_ptr<PrefServiceSyncable> pref_service_;
+ scoped_ptr<PrefService> pref_service_;
scoped_ptr<ExtensionPrefs> prefs_;
scoped_ptr<ExtensionPrefValueMap> extension_pref_value_map_;
const scoped_refptr<base::SequencedTaskRunner> task_runner_;

Powered by Google App Engine
This is Rietveld 408576698