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

Unified Diff: chrome/test/base/testing_profile.h

Issue 9583036: Revert 124817 - Take extensions out of Profile into a profile-keyed service, ExtensionSystem. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 10 months 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
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | chrome/test/base/testing_profile.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/base/testing_profile.h
===================================================================
--- chrome/test/base/testing_profile.h (revision 124830)
+++ chrome/test/base/testing_profile.h (working copy)
@@ -133,6 +133,18 @@
// Blocks until TempalteURLService finishes loading.
void BlockUntilTemplateURLServiceLoaded();
+ // Creates an ExtensionProcessManager. If not invoked, the
+ // ExtensionProcessManager is NULL.
+ void CreateExtensionProcessManager();
+
+ // Creates an ExtensionService initialized with the testing profile and
+ // returns it. The profile keeps its own copy of a scoped_refptr to the
+ // ExtensionService to make sure that is still alive to be notified when the
+ // profile is destroyed.
+ ExtensionService* CreateExtensionService(const CommandLine* command_line,
+ const FilePath& install_directory,
+ bool autoupdate_enabled);
+
TestingPrefService* GetTestingPrefService();
// content::BrowserContext
@@ -168,10 +180,11 @@
virtual bool HasOffTheRecordProfile() OVERRIDE;
virtual Profile* GetOriginalProfile() OVERRIDE;
virtual VisitedLinkMaster* GetVisitedLinkMaster() OVERRIDE;
- virtual ExtensionPrefValueMap* GetExtensionPrefValueMap() OVERRIDE;
virtual ExtensionService* GetExtensionService() OVERRIDE;
virtual UserScriptMaster* GetUserScriptMaster() OVERRIDE;
+ virtual ExtensionDevToolsManager* GetExtensionDevToolsManager() OVERRIDE;
virtual ExtensionProcessManager* GetExtensionProcessManager() OVERRIDE;
+ virtual ExtensionMessageService* GetExtensionMessageService() OVERRIDE;
virtual ExtensionEventRouter* GetExtensionEventRouter() OVERRIDE;
void SetExtensionSpecialStoragePolicy(
ExtensionSpecialStoragePolicy* extension_special_storage_policy);
@@ -228,6 +241,7 @@
virtual base::Time GetStartTime() const OVERRIDE;
virtual ProtocolHandlerRegistry* GetProtocolHandlerRegistry() OVERRIDE;
virtual void MarkAsCleanShutdown() OVERRIDE {}
+ virtual void InitExtensions(bool extensions_enabled) OVERRIDE {}
virtual void InitPromoResources() OVERRIDE {}
virtual void InitRegisteredProtocolHandlers() OVERRIDE {}
@@ -253,6 +267,7 @@
void BlockUntilHistoryProcessesPendingRequests();
virtual TokenService* GetTokenService() OVERRIDE;
+ virtual ExtensionInfoMap* GetExtensionInfoMap() OVERRIDE;
virtual PromoCounter* GetInstantPromoCounter() OVERRIDE;
virtual ChromeURLDataManager* GetChromeURLDataManager() OVERRIDE;
virtual chrome_browser_net::Predictor* GetNetworkPredictor() OVERRIDE;
@@ -336,6 +351,16 @@
FilePath last_selected_directory_;
scoped_refptr<history::TopSites> top_sites_; // For history and thumbnails.
+ // The Extension Preferences. Only created if CreateExtensionService is
+ // invoked.
+ scoped_ptr<ExtensionPrefs> extension_prefs_;
+
+ scoped_ptr<ExtensionService> extension_service_;
+
+ scoped_ptr<ExtensionProcessManager> extension_process_manager_;
+
+ scoped_ptr<ExtensionPrefValueMap> extension_pref_value_map_;
+
scoped_refptr<ExtensionSpecialStoragePolicy>
extension_special_storage_policy_;
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | chrome/test/base/testing_profile.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698