Inspector: wrapped inspector agent instances into factory-like wrappers

Source/core/inspector/WorkerInspectorController.cpp

Index: Source/core/inspector/WorkerInspectorController.cpp
diff --git a/Source/core/inspector/WorkerInspectorController.cpp b/Source/core/inspector/WorkerInspectorController.cpp
index cf841834b088deefb6882d56adaf1c768fea676d..241fe710f3394d0927fb9c1971b5b1266f96029e 100644
--- a/Source/core/inspector/WorkerInspectorController.cpp
+++ b/Source/core/inspector/WorkerInspectorController.cpp
@@ -95,15 +95,15 @@ WorkerInspectorController::WorkerInspectorController(WorkerContext* workerContex
     , m_injectedScriptManager(InjectedScriptManager::createForWorker())
     , m_debugServer(adoptPtr(new WorkerScriptDebugServer(workerContext, WorkerDebuggerAgent::debuggerTaskMode)))
 {
-    m_agents.append(WorkerRuntimeAgent::create(m_instrumentingAgents.get(), m_state.get(), m_injectedScriptManager.get(), m_debugServer.get(), workerContext));
+    m_agentFactories.append(WorkerRuntimeFactory::create(m_instrumentingAgents.get(), m_state.get(), m_injectedScriptManager.get(), m_debugServer.get(), workerContext));
 
-    OwnPtr<InspectorConsoleAgent> consoleAgent = WorkerConsoleAgent::create(m_instrumentingAgents.get(), m_state.get(), m_injectedScriptManager.get());
-    m_agents.append(WorkerDebuggerAgent::create(m_instrumentingAgents.get(), m_state.get(), m_debugServer.get(), workerContext, m_injectedScriptManager.get()));
+    OwnPtr<WorkerConsoleFactory> consoleFactory = WorkerConsoleFactory::create(m_instrumentingAgents.get(), m_state.get(), m_injectedScriptManager.get());
+    m_agentFactories.append(WorkerDebuggerFactory::create(m_instrumentingAgents.get(), m_state.get(), m_debugServer.get(), workerContext, m_injectedScriptManager.get()));
 
-    m_agents.append(InspectorProfilerAgent::create(m_instrumentingAgents.get(), consoleAgent.get(), m_state.get(), m_injectedScriptManager.get()));
-    m_agents.append(InspectorHeapProfilerAgent::create(m_instrumentingAgents.get(), m_state.get(), m_injectedScriptManager.get()));
-    m_agents.append(InspectorTimelineAgent::create(m_instrumentingAgents.get(), 0, 0, 0, m_state.get(), InspectorTimelineAgent::WorkerInspector, 0));
-    m_agents.append(consoleAgent.release());
+    m_agentFactories.append(InspectorProfilerFactory::create(m_instrumentingAgents.get(), m_state.get(), consoleFactory.get(), m_injectedScriptManager.get()));
+    m_agentFactories.append(InspectorHeapProfilerFactory::create(m_instrumentingAgents.get(), m_state.get(), m_injectedScriptManager.get()));
+    m_agentFactories.append(InspectorTimelineFactory::create(m_instrumentingAgents.get(), m_state.get(), 0, 0, 0, InspectorTimelineAgent::WorkerInspector, 0));
+    m_agentFactories.append(consoleFactory.release());
 
     m_injectedScriptManager->injectedScriptHost()->init(m_instrumentingAgents.get(), m_debugServer.get());
 }
@@ -121,8 +121,8 @@ void WorkerInspectorController::connectFrontend()
     m_frontendChannel = adoptPtr(new PageInspectorProxy(m_workerContext));
     m_frontend = adoptPtr(new InspectorFrontend(m_frontendChannel.get()));
     m_backendDispatcher = InspectorBackendDispatcher::create(m_frontendChannel.get());
-    m_agents.registerInDispatcher(m_backendDispatcher.get());
-    m_agents.setFrontend(m_frontend.get());
+    m_agentFactories.registerInDispatcher(m_backendDispatcher.get());
+    m_agentFactories.setFrontend(m_frontend.get());
 }
 
 void WorkerInspectorController::disconnectFrontend()
@@ -134,7 +134,7 @@ void WorkerInspectorController::disconnectFrontend()
     // Destroying agents would change the state, but we don't want that.
     // Pre-disconnect state will be used to restore inspector agents.
     m_state->mute();
-    m_agents.clearFrontend();
+    m_agentFactories.clearFrontend();
     m_frontend.clear();
     m_frontendChannel.clear();
 }
@@ -145,7 +145,7 @@ void WorkerInspectorController::restoreInspectorStateFromCookie(const String& in
     connectFrontend();
     m_state->loadFromCookie(inspectorCookie);
 
-    m_agents.restore();
+    m_agentFactories.restore();
 }
 
 void WorkerInspectorController::dispatchMessageFromFrontend(const String& message)