| Index: chrome/test/base/testing_profile.h
|
| diff --git a/chrome/test/base/testing_profile.h b/chrome/test/base/testing_profile.h
|
| index 5945cb15d83486cf0c21d2f9cae604209ac524e9..21a387c54c0171532c691582c60897494973e275 100644
|
| --- a/chrome/test/base/testing_profile.h
|
| +++ b/chrome/test/base/testing_profile.h
|
| @@ -133,18 +133,6 @@ class TestingProfile : public Profile {
|
| // 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
|
| @@ -181,11 +169,10 @@ class TestingProfile : public Profile {
|
| 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);
|
| @@ -242,7 +229,6 @@ class TestingProfile : public Profile {
|
| 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 {}
|
|
|
| @@ -267,7 +253,6 @@ class TestingProfile : public Profile {
|
| // history service processes all pending requests.
|
| void BlockUntilHistoryProcessesPendingRequests();
|
|
|
| - virtual ExtensionInfoMap* GetExtensionInfoMap() OVERRIDE;
|
| virtual PromoCounter* GetInstantPromoCounter() OVERRIDE;
|
| virtual ChromeURLDataManager* GetChromeURLDataManager() OVERRIDE;
|
| virtual chrome_browser_net::Predictor* GetNetworkPredictor() OVERRIDE;
|
| @@ -349,16 +334,6 @@ class TestingProfile : public Profile {
|
| 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_;
|
|
|
|
|