Inspector: wrapped inspector agent instances into factory-like wrappers

Source/core/inspector/InspectorResourceAgent.h

Index: Source/core/inspector/InspectorResourceAgent.h
diff --git a/Source/core/inspector/InspectorResourceAgent.h b/Source/core/inspector/InspectorResourceAgent.h
index 40827c633658bbee10a01509a1850ae7968fdc1a..de913c7dc013cebfd7331ba64be06cf0d774075a 100644
--- a/Source/core/inspector/InspectorResourceAgent.h
+++ b/Source/core/inspector/InspectorResourceAgent.h
@@ -59,6 +59,7 @@ class InspectorClient;
 class InspectorFrontend;
 class InspectorObject;
 class InspectorPageAgent;
+class InspectorPageController;
 class InspectorState;
 class InstrumentingAgents;
 class KURL;
@@ -79,19 +80,14 @@ class WebSocketHandshakeResponse;
 
 typedef String ErrorString;
 
-class InspectorResourceAgent : public InspectorBaseAgent<InspectorResourceAgent>, public InspectorBackendDispatcher::NetworkCommandHandler {
+class InspectorResourceAgent : public InspectorBaseAgent, public InspectorBackendDispatcher::NetworkCommandHandler {
 public:
-    static PassOwnPtr<InspectorResourceAgent> create(InstrumentingAgents* instrumentingAgents, InspectorPageAgent* pageAgent, InspectorClient* client, InspectorCompositeState* state)
-    {
-        return adoptPtr(new InspectorResourceAgent(instrumentingAgents, pageAgent, client, state));
-    }
+    static PassRefPtr<InspectorResourceAgent> create(InstrumentingAgents*, InspectorState*, PassRefPtr<InspectorPageAgent>, InspectorClient*);
 
     virtual void setFrontend(InspectorFrontend*);
     virtual void clearFrontend();
     virtual void restore();
 
-    static PassRefPtr<InspectorResourceAgent> restore(Page*, InspectorCompositeState*, InspectorFrontend*);
-
     ~InspectorResourceAgent();
 
     void willSendRequest(unsigned long identifier, DocumentLoader*, ResourceRequest&, const ResourceResponse& redirectResponse, const CachedResourceInitiatorInfo&);
@@ -154,11 +150,11 @@ public:
     virtual void reportMemoryUsage(MemoryObjectInfo*) const OVERRIDE;
 
 private:
-    InspectorResourceAgent(InstrumentingAgents*, InspectorPageAgent*, InspectorClient*, InspectorCompositeState*);
+    InspectorResourceAgent(InstrumentingAgents*, InspectorState*, PassRefPtr<InspectorPageAgent>, InspectorClient*);
 
     void enable();
 
-    InspectorPageAgent* m_pageAgent;
+    RefPtr<InspectorPageAgent> m_pageAgent;
     InspectorClient* m_client;
     InspectorFrontend::Network* m_frontend;
     String m_userAgentOverride;
@@ -172,6 +168,18 @@ private:
     bool m_isRecalculatingStyle;
 };
 
+class InspectorResourceController: public InspectorBaseController<InspectorResourceController, InspectorResourceAgent> {
+public:
+
+    static PassOwnPtr<InspectorResourceController> create(InstrumentingAgents* instrumentingAgents, InspectorCompositeState* compositeState, InspectorPageController* pageController, InspectorClient* client)
+    {
+        return adoptPtr(new InspectorResourceController(instrumentingAgents, compositeState, pageController, client));
+    }
+
+protected:
+    InspectorResourceController(InstrumentingAgents*, InspectorCompositeState*, InspectorPageController*, InspectorClient*);
+};
+
 } // namespace WebCore