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..8ead2865860c57cc0211205ad79799e1e8e3b40c 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 InspectorPageController;
 class InspectorState;
 class InstrumentingAgents;
 class Page;
@@ -49,12 +50,9 @@ 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));
-    }
+    static PassRefPtr<InspectorDOMStorageAgent> create(InstrumentingAgents*, InspectorState*, PassRefPtr<InspectorPageAgent>);
     ~InspectorDOMStorageAgent();
 
     virtual void setFrontend(InspectorFrontend*);
@@ -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 InspectorDOMStorageController: public InspectorBaseController<InspectorDOMStorageController, InspectorDOMStorageAgent> {
+public:
+
+    static PassOwnPtr<InspectorDOMStorageController> create(InstrumentingAgents* instrumentingAgents, InspectorCompositeState* compositeState, InspectorPageController* pageController)
+    {
+        return adoptPtr(new InspectorDOMStorageController(instrumentingAgents, compositeState, pageController));
+    }
+
+protected:
+    InspectorDOMStorageController(InstrumentingAgents*, InspectorCompositeState*, InspectorPageController*);
+};
+
 } // namespace WebCore
 
 #endif // !defined(InspectorDOMStorageAgent_h)