Reland: Move ExtensionProcessManager to src/extensions, part 4

chrome/browser/extensions/test_extension_system.cc

Index: chrome/browser/extensions/test_extension_system.cc
diff --git a/chrome/browser/extensions/test_extension_system.cc b/chrome/browser/extensions/test_extension_system.cc
index 24d57b8c5619b430f5c864cb953772a7041cc516..3a9cad7ab0cb1dc8eb22019c1a3cb01a20e38375 100644
--- a/chrome/browser/extensions/test_extension_system.cc
+++ b/chrome/browser/extensions/test_extension_system.cc
@@ -13,7 +13,6 @@
 #include "chrome/browser/extensions/extension_pref_value_map_factory.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_prefs_factory.h"
-#include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/management_policy.h"
@@ -25,6 +24,7 @@
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/browser_thread.h"
 #include "extensions/browser/info_map.h"
+#include "extensions/browser/process_manager.h"
 
 using content::BrowserThread;
 
@@ -40,16 +40,15 @@ TestExtensionSystem::~TestExtensionSystem() {
 }
 
 void TestExtensionSystem::Shutdown() {
-  extension_process_manager_.reset();
+  process_manager_.reset();
 }
 
-void TestExtensionSystem::CreateExtensionProcessManager() {
-  extension_process_manager_.reset(ExtensionProcessManager::Create(profile_));
+void TestExtensionSystem::CreateProcessManager() {
+  process_manager_.reset(ProcessManager::Create(profile_));
 }
 
-void TestExtensionSystem::SetExtensionProcessManager(
-    ExtensionProcessManager* manager) {
-  extension_process_manager_.reset(manager);
+void TestExtensionSystem::SetProcessManager(ProcessManager* manager) {
+  process_manager_.reset(manager);
 }
 
 ExtensionPrefs* TestExtensionSystem::CreateExtensionPrefs(
@@ -120,8 +119,8 @@ UserScriptMaster* TestExtensionSystem::user_script_master() {
   return NULL;
 }
 
-ExtensionProcessManager* TestExtensionSystem::process_manager() {
-  return extension_process_manager_.get();
+ProcessManager* TestExtensionSystem::process_manager() {
+  return process_manager_.get();
 }
 
 StateStore* TestExtensionSystem::state_store() {