Index: chrome/browser/extensions/test_extension_system.h |
diff --git a/chrome/browser/extensions/test_extension_system.h b/chrome/browser/extensions/test_extension_system.h |
index 2db7f6b22abfdaf921211536a084a91f50db5c43..1111feb586779be815e9015b58546e2a17eb7c1d 100644 |
--- a/chrome/browser/extensions/test_extension_system.h |
+++ b/chrome/browser/extensions/test_extension_system.h |
@@ -54,14 +54,15 @@ class TestExtensionSystem : public ExtensionSystem { |
// Creates a ProcessManager. If not invoked, the ProcessManager is NULL. |
void CreateProcessManager(); |
- // Allows the ProcessManager to be overriden, for example by a stub |
+ // Allows the ProcessManager to be overridden, for example by a stub |
// implementation. Takes ownership of |manager|. |
void SetProcessManager(ProcessManager* manager); |
void CreateSocketManager(); |
virtual void InitForRegularProfile(bool extensions_enabled) OVERRIDE {} |
- void SetExtensionService(ExtensionService* service); |
+ // Takes ownership of |service| if |owned| if true. |
Yoyo Zhou
2014/09/05 16:21:33
typo: is true
Lei Zhang
2014/09/05 19:35:08
Reverted TestExtensionSystem changes.
|
+ void SetExtensionService(ExtensionService* service, bool owned); |
virtual ExtensionService* extension_service() OVERRIDE; |
virtual RuntimeData* runtime_data() OVERRIDE; |
virtual ManagementPolicy* management_policy() OVERRIDE; |
@@ -107,7 +108,6 @@ class TestExtensionSystem : public ExtensionSystem { |
standard_management_policy_provider_; |
scoped_ptr<ManagementPolicy> management_policy_; |
scoped_ptr<RuntimeData> runtime_data_; |
- scoped_ptr<ExtensionService> extension_service_; |
scoped_ptr<ProcessManager> process_manager_; |
scoped_refptr<InfoMap> info_map_; |
scoped_ptr<EventRouter> event_router_; |
@@ -115,6 +115,11 @@ class TestExtensionSystem : public ExtensionSystem { |
scoped_ptr<InstallVerifier> install_verifier_; |
scoped_ptr<QuotaService> quota_service_; |
OneShotEvent ready_; |
+ |
+ // Ownership depends on |extension_service_owned_|. |
+ ExtensionService* extension_service_; |
+ // True by default. |
+ bool extension_service_owned_; |
}; |
} // namespace extensions |