Inspector: wrapped inspector agent instances into factory-like wrappers

Source/core/inspector/InspectorMemoryAgent.h

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 29 matching lines @@
 namespace WebCore {
 
 class InspectorClient;
 class InspectorDOMStorageAgent;
 class InspectorState;
 class InstrumentingAgents;
 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();
 
     virtual void getDOMCounters(ErrorString*, int* documents, int* nodes, int* jsEventListeners);
     virtual void getProcessMemoryDistribution(ErrorString*, const bool* reportGraph, RefPtr<TypeBuilder::Memory::MemoryBlock>& out_processMemory, RefPtr<InspectorObject>& graphMetaInformation);
 
     virtual void reportMemoryUsage(MemoryObjectInfo*) const;
 
     void getProcessMemoryDistributionMap(HashMap<String, size_t>* memoryInfo);
 
     virtual void setFrontend(InspectorFrontend*);
     virtual void clearFrontend();
 
 private:
-    InspectorMemoryAgent(InstrumentingAgents*, InspectorClient*, InspectorCompositeState*, Page*);
+    InspectorMemoryAgent(InstrumentingAgents*, InspectorClient*, InspectorState*, Page*);
 
     PassRefPtr<InspectorObject> getProcessMemoryDistributionImpl(bool reportGraph, HashMap<String, size_t>* memoryInfo);
 
     InspectorClient* m_inspectorClient;
     Page* m_page;
     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)