diff options
Diffstat (limited to 'chrome/browser/extensions/test_extension_system.h')
| -rw-r--r-- | chrome/browser/extensions/test_extension_system.h | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/chrome/browser/extensions/test_extension_system.h b/chrome/browser/extensions/test_extension_system.h index 53d4c04..4a06463 100644 --- a/chrome/browser/extensions/test_extension_system.h +++ b/chrome/browser/extensions/test_extension_system.h @@ -36,7 +36,7 @@ class TestExtensionSystem : public ExtensionSystem { virtual ~TestExtensionSystem(); // KeyedService implementation. - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; // Creates an ExtensionPrefs with the testing profile and returns it. // Useful for tests that need to modify prefs before creating the @@ -60,32 +60,32 @@ class TestExtensionSystem : public ExtensionSystem { void CreateSocketManager(); - virtual void InitForRegularProfile(bool extensions_enabled) OVERRIDE {} + virtual void InitForRegularProfile(bool extensions_enabled) override {} void SetExtensionService(ExtensionService* service); - virtual ExtensionService* extension_service() OVERRIDE; - virtual RuntimeData* runtime_data() OVERRIDE; - virtual ManagementPolicy* management_policy() OVERRIDE; - virtual SharedUserScriptMaster* shared_user_script_master() OVERRIDE; - virtual ProcessManager* process_manager() OVERRIDE; - virtual StateStore* state_store() OVERRIDE; - virtual StateStore* rules_store() OVERRIDE; + virtual ExtensionService* extension_service() override; + virtual RuntimeData* runtime_data() override; + virtual ManagementPolicy* management_policy() override; + virtual SharedUserScriptMaster* shared_user_script_master() override; + virtual ProcessManager* process_manager() override; + virtual StateStore* state_store() override; + virtual StateStore* rules_store() override; TestingValueStore* value_store() { return value_store_; } - virtual InfoMap* info_map() OVERRIDE; - virtual LazyBackgroundTaskQueue* lazy_background_task_queue() OVERRIDE; + virtual InfoMap* info_map() override; + virtual LazyBackgroundTaskQueue* lazy_background_task_queue() override; void SetEventRouter(scoped_ptr<EventRouter> event_router); - virtual EventRouter* event_router() OVERRIDE; - virtual WarningService* warning_service() OVERRIDE; - virtual Blacklist* blacklist() OVERRIDE; - virtual ErrorConsole* error_console() OVERRIDE; - virtual InstallVerifier* install_verifier() OVERRIDE; - virtual QuotaService* quota_service() OVERRIDE; - virtual const OneShotEvent& ready() const OVERRIDE; - virtual ContentVerifier* content_verifier() OVERRIDE; + virtual EventRouter* event_router() override; + virtual WarningService* warning_service() override; + virtual Blacklist* blacklist() override; + virtual ErrorConsole* error_console() override; + virtual InstallVerifier* install_verifier() override; + virtual QuotaService* quota_service() override; + virtual const OneShotEvent& ready() const override; + virtual ContentVerifier* content_verifier() override; virtual scoped_ptr<ExtensionSet> GetDependentExtensions( - const Extension* extension) OVERRIDE; + const Extension* extension) override; virtual DeclarativeUserScriptMaster* GetDeclarativeUserScriptMasterByExtension( - const ExtensionId& extension_id) OVERRIDE; + const ExtensionId& extension_id) override; // Note that you probably want to use base::RunLoop().RunUntilIdle() right // after this to run all the accumulated tasks. |