Inspector: wrapped inspector agent instances into factory-like wrappers

Source/core/inspector/InspectorResourceAgent.cpp

Index: Source/core/inspector/InspectorResourceAgent.cpp
diff --git a/Source/core/inspector/InspectorResourceAgent.cpp b/Source/core/inspector/InspectorResourceAgent.cpp
index c9ea29ebc5662f3bcaf41875e89ecdbcb8845837..6ab3a1e3df2f1eb89c8449e1d37fcbf85fc1f626 100644
--- a/Source/core/inspector/InspectorResourceAgent.cpp
+++ b/Source/core/inspector/InspectorResourceAgent.cpp
@@ -739,8 +739,8 @@ void InspectorResourceAgent::didCommitLoad(Frame* frame, DocumentLoader* loader)
 void InspectorResourceAgent::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
 {
     MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::InspectorResourceAgent);
-    InspectorBaseAgent<InspectorResourceAgent>::reportMemoryUsage(memoryObjectInfo);
-    info.addWeakPointer(m_pageAgent);
+    InspectorBaseAgent::reportMemoryUsage(memoryObjectInfo);
+    info.addWeakPointer(m_pageAgent.get());
     info.addWeakPointer(m_client);
     info.addWeakPointer(m_frontend);
     info.addMember(m_userAgentOverride, "userAgentOverride");
@@ -749,8 +749,13 @@ void InspectorResourceAgent::reportMemoryUsage(MemoryObjectInfo* memoryObjectInf
     info.addMember(m_styleRecalculationInitiator, "styleRecalculationInitiator");
 }
 
-InspectorResourceAgent::InspectorResourceAgent(InstrumentingAgents* instrumentingAgents, InspectorPageAgent* pageAgent, InspectorClient* client, InspectorCompositeState* state)
-    : InspectorBaseAgent<InspectorResourceAgent>("Network", instrumentingAgents, state)
+PassRefPtr<InspectorResourceAgent> InspectorResourceAgent::create(InstrumentingAgents* instrumentingAgents, InspectorState* state, PassRefPtr<InspectorPageAgent> pageAgent, InspectorClient* client)
+{
+    return adoptRef(new InspectorResourceAgent(instrumentingAgents, state, pageAgent, client));
+}
+
+InspectorResourceAgent::InspectorResourceAgent(InstrumentingAgents* instrumentingAgents, InspectorState* state, PassRefPtr<InspectorPageAgent> pageAgent, InspectorClient* client)
+    : InspectorBaseAgent(instrumentingAgents, state)
     , m_pageAgent(pageAgent)
     , m_client(client)
     , m_frontend(0)
@@ -760,5 +765,11 @@ InspectorResourceAgent::InspectorResourceAgent(InstrumentingAgents* instrumentin
 {
 }
 
+InspectorResourceController::InspectorResourceController(InstrumentingAgents* instrumentingAgents, InspectorCompositeState* compositeState, InspectorPageController* pageController, InspectorClient* client)
+    : InspectorBaseController<InspectorResourceController, InspectorResourceAgent>("Resource", instrumentingAgents, compositeState)
+{
+    setAgent(InspectorResourceAgent::create(m_instrumentingAgents, m_state, pageController->getAgent(), client));
+}
+
 } // namespace WebCore