Index: chrome/test/testing_profile.h |
diff --git a/chrome/test/testing_profile.h b/chrome/test/testing_profile.h |
index de7f32faffe01df0d15887a5dd6b0feed35e4542..3d5541a056045d34946eef6d7fc20db9bd06d02e 100644 |
--- a/chrome/test/testing_profile.h |
+++ b/chrome/test/testing_profile.h |
@@ -24,6 +24,7 @@ class AutocompleteClassifier; |
class BookmarkModel; |
class BrowserThemeProvider; |
class CommandLine; |
+class ExtensionPrefs; |
class DesktopNotificationService; |
class FaviconService; |
class FindBarState; |
@@ -32,6 +33,7 @@ class GeolocationPermissionContext; |
class HistoryService; |
class HostContentSettingsMap; |
class PrefService; |
+class PrefStore; |
class ProfileSyncService; |
class SessionService; |
class TemplateURLModel; |
@@ -186,6 +188,8 @@ class TestingProfile : public Profile { |
// TestingPrefService takes ownership of |prefs|. |
void SetPrefService(PrefService* prefs); |
virtual PrefService* GetPrefs(); |
+ virtual PrefStore* GetExtensionPrefStore(); |
+ virtual void SetExtensionPrefStore(PrefStore* ext_pref_store); |
virtual TemplateURLModel* GetTemplateURLModel() { |
return template_url_model_.get(); |
} |
@@ -318,6 +322,9 @@ class TestingProfile : public Profile { |
// ref only for right type, lifecycle is managed by prefs_ |
TestingPrefService* testing_prefs_; |
+ // Creates a TestingPrefService and associates it with the TestingProfile |
+ virtual void CreateTestingPrefService(); |
+ |
private: |
// Destroys favicon service if it has been created. |
void DestroyFaviconService(); |
@@ -326,9 +333,6 @@ class TestingProfile : public Profile { |
// from the destructor. |
void DestroyWebDataService(); |
- // Creates a TestingPrefService and associates it with the TestingProfile |
- void CreateTestingPrefService(); |
- |
// The favicon service. Only created if CreateFaviconService is invoked. |
scoped_refptr<FaviconService> favicon_service_; |
@@ -406,6 +410,10 @@ class TestingProfile : public Profile { |
// is disposed. |
scoped_refptr<ExtensionsService> extensions_service_; |
+ scoped_ptr<ExtensionPrefs> extension_prefs_; |
+ |
+ PrefStore* ext_pref_store_; |
Mattias Nissler (ping if slow)
2010/12/01 10:36:36
Can we name this extension_pref_store? The profile
battre (please use the other)
2010/12/01 17:44:38
Done.
|
+ |
// The proxy prefs tracker. |
scoped_refptr<PrefProxyConfigTracker> pref_proxy_config_tracker_; |