| 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 6ae064c7d3aa93f1c82fd1b803b77c0e41b761d7..4bf61e8a7db1f0e57542d85ca8c1b6e8f1c3af77 100644
|
| --- a/chrome/browser/extensions/test_extension_system.h
|
| +++ b/chrome/browser/extensions/test_extension_system.h
|
| @@ -44,13 +44,12 @@ class TestExtensionSystem : public ExtensionSystem {
|
| const base::FilePath& install_directory,
|
| bool autoupdate_enabled);
|
|
|
| - // Creates an ExtensionProcessManager. If not invoked, the
|
| - // ExtensionProcessManager is NULL.
|
| - void CreateExtensionProcessManager();
|
| + // Creates a ProcessManager. If not invoked, the ProcessManager is NULL.
|
| + void CreateProcessManager();
|
|
|
| - // Allows the ExtensionProcessManager to be overriden, for example by a
|
| - // stub implementation. Takes ownership of |manager|.
|
| - void SetExtensionProcessManager(ExtensionProcessManager* manager);
|
| + // Allows the ProcessManager to be overriden, for example by a stub
|
| + // implementation. Takes ownership of |manager|.
|
| + void SetProcessManager(ProcessManager* manager);
|
|
|
| void CreateSocketManager();
|
|
|
| @@ -60,7 +59,7 @@ class TestExtensionSystem : public ExtensionSystem {
|
| virtual ExtensionService* extension_service() OVERRIDE;
|
| virtual ManagementPolicy* management_policy() OVERRIDE;
|
| virtual UserScriptMaster* user_script_master() OVERRIDE;
|
| - virtual ExtensionProcessManager* process_manager() OVERRIDE;
|
| + virtual ProcessManager* process_manager() OVERRIDE;
|
| virtual StateStore* state_store() OVERRIDE;
|
| virtual StateStore* rules_store() OVERRIDE;
|
| TestingValueStore* value_store() { return value_store_; }
|
| @@ -92,7 +91,7 @@ class TestExtensionSystem : public ExtensionSystem {
|
| standard_management_policy_provider_;
|
| scoped_ptr<ManagementPolicy> management_policy_;
|
| scoped_ptr<ExtensionService> extension_service_;
|
| - scoped_ptr<ExtensionProcessManager> extension_process_manager_;
|
| + scoped_ptr<ProcessManager> process_manager_;
|
| scoped_refptr<InfoMap> info_map_;
|
| scoped_ptr<ErrorConsole> error_console_;
|
| OneShotEvent ready_;
|
|
|