Inspector: wrapped inspector agent instances into factory-like wrappers

Source/core/inspector/InspectorMemoryAgent.h

Index: Source/core/inspector/InspectorMemoryAgent.h
diff --git a/Source/core/inspector/InspectorMemoryAgent.h b/Source/core/inspector/InspectorMemoryAgent.h
index 0f580c34bb4331c225f86bf29d3c8aa7cc6f6ebb..6ca9483b44ac0a72648692fa4fc8113a53571382 100644
--- a/Source/core/inspector/InspectorMemoryAgent.h
+++ b/Source/core/inspector/InspectorMemoryAgent.h
@@ -47,14 +47,14 @@ class Page;
 
 typedef String ErrorString;
 
-class InspectorMemoryAgent : public InspectorBaseAgent<InspectorMemoryAgent>, public InspectorBackendDispatcher::MemoryCommandHandler {
+class InspectorMemoryAgent : public InspectorBaseAgent, public InspectorBackendDispatcher::MemoryCommandHandler {
     WTF_MAKE_NONCOPYABLE(InspectorMemoryAgent);
 public:
-    typedef Vector<OwnPtr<InspectorBaseAgentInterface> > InspectorAgents;
+    typedef Vector<OwnPtr<InspectorBaseAgent> > InspectorAgents;
 
-    static PassOwnPtr<InspectorMemoryAgent> create(InstrumentingAgents* instrumentingAgents, InspectorClient* client, InspectorCompositeState* state, Page* page)
+    static PassRefPtr<InspectorMemoryAgent> create(InstrumentingAgents* instrumentingAgents, InspectorClient* client, InspectorState* state, Page* page)
     {
-        return adoptPtr(new InspectorMemoryAgent(instrumentingAgents, client, state, page));
+        return adoptRef(new InspectorMemoryAgent(instrumentingAgents, client, state, page));
     }
     virtual ~InspectorMemoryAgent();
 
@@ -69,7 +69,7 @@ public:
     virtual void clearFrontend();
 
 private:
-    InspectorMemoryAgent(InstrumentingAgents*, InspectorClient*, InspectorCompositeState*, Page*);
+    InspectorMemoryAgent(InstrumentingAgents*, InspectorClient*, InspectorState*, Page*);
 
     PassRefPtr<InspectorObject> getProcessMemoryDistributionImpl(bool reportGraph, HashMap<String, size_t>* memoryInfo);
 
@@ -78,6 +78,22 @@ private:
     InspectorFrontend::Memory* m_frontend;
 };
 
+class InspectorMemoryController: public InspectorBaseController<InspectorMemoryController, InspectorMemoryAgent> {
+public:
+
+    static PassOwnPtr<InspectorMemoryController> create(InstrumentingAgents* instrumentingAgents, InspectorClient* client, InspectorCompositeState* compositeState, Page* page)
+    {
+        return adoptPtr(new InspectorMemoryController(instrumentingAgents, client, compositeState, page));
+    }
+
+protected:
+    InspectorMemoryController(InstrumentingAgents* instrumentingAgents, InspectorClient* client, InspectorCompositeState* compositeState, Page* page)
+        : InspectorBaseController<InspectorMemoryController, InspectorMemoryAgent>("Memory", instrumentingAgents, compositeState)
+    {
+        setAgent(InspectorMemoryAgent::create(m_instrumentingAgents, client, m_state, page));
+    }
+};
+
 } // namespace WebCore
 
 #endif // !defined(InspectorMemoryAgent_h)