Inspector: wrapped inspector agent instances into factory-like wrappers

Source/core/inspector/InspectorDOMStorageAgent.h

Index: Source/core/inspector/InspectorDOMStorageAgent.h
diff --git a/Source/core/inspector/InspectorDOMStorageAgent.h b/Source/core/inspector/InspectorDOMStorageAgent.h
index 3cacfbaac304a525cf247ef67762f18fb644a8a0..2fa91945becbaa26d42b056786b3a39af3e9d9a7 100644
--- a/Source/core/inspector/InspectorDOMStorageAgent.h
+++ b/Source/core/inspector/InspectorDOMStorageAgent.h
@@ -41,6 +41,7 @@ class Frame;
 class InspectorArray;
 class InspectorFrontend;
 class InspectorPageAgent;
+class InspectorPageFactory;
 class InspectorState;
 class InstrumentingAgents;
 class Page;
@@ -49,13 +50,10 @@ class StorageArea;
 
 typedef String ErrorString;
 
-class InspectorDOMStorageAgent : public InspectorBaseAgent<InspectorDOMStorageAgent>, public InspectorBackendDispatcher::DOMStorageCommandHandler {
+class InspectorDOMStorageAgent : public InspectorBaseAgent, public InspectorBackendDispatcher::DOMStorageCommandHandler {
 public:
-    static PassOwnPtr<InspectorDOMStorageAgent> create(InstrumentingAgents* instrumentingAgents, InspectorPageAgent* pageAgent, InspectorCompositeState* state)
-    {
-        return adoptPtr(new InspectorDOMStorageAgent(instrumentingAgents, pageAgent, state));
-    }
-    ~InspectorDOMStorageAgent();
+    static PassRefPtr<InspectorDOMStorageAgent> create(InstrumentingAgents*, InspectorState*, PassRefPtr<InspectorPageAgent>);
+    virtual ~InspectorDOMStorageAgent();
 
     virtual void setFrontend(InspectorFrontend*);
     virtual void clearFrontend();
@@ -78,15 +76,27 @@ public:
 
 private:
 
-    InspectorDOMStorageAgent(InstrumentingAgents*, InspectorPageAgent*, InspectorCompositeState*);
+    InspectorDOMStorageAgent(InstrumentingAgents*, InspectorState*, PassRefPtr<InspectorPageAgent>);
 
     bool isEnabled() const;
     PassRefPtr<StorageArea> findStorageArea(ErrorString*, const RefPtr<InspectorObject>&, Frame*&);
 
-    InspectorPageAgent* m_pageAgent;
+    RefPtr<InspectorPageAgent> m_pageAgent;
     InspectorFrontend* m_frontend;
 };
 
+class InspectorDOMStorageFactory : public InspectorBaseFactory<InspectorDOMStorageFactory, InspectorDOMStorageAgent> {
+public:
+
+    static PassOwnPtr<InspectorDOMStorageFactory> create(InstrumentingAgents* instrumentingAgents, InspectorCompositeState* compositeState, InspectorPageFactory* pageFactory)
+    {
+        return adoptPtr(new InspectorDOMStorageFactory(instrumentingAgents, compositeState, pageFactory));
+    }
+
+protected:
+    InspectorDOMStorageFactory(InstrumentingAgents*, InspectorCompositeState*, InspectorPageFactory*);
+};
+
 } // namespace WebCore
 
 #endif // !defined(InspectorDOMStorageAgent_h)