Inspector: wrapped inspector agent instances into factory-like wrappers

Source/core/inspector/InspectorHeapProfilerAgent.h

 /*
  * Copyright (C) 2013 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 33 matching lines @@
 namespace WebCore {
 
 class HeapObjectsStatsStream;
 class InjectedScriptManager;
 class HeapStatsUpdateTask;
 class ScriptHeapSnapshot;
 class ScriptProfile;
 
 typedef String ErrorString;
 
-class InspectorHeapProfilerAgent : public InspectorBaseAgent<InspectorHeapProfilerAgent>, public InspectorBackendDispatcher::HeapProfilerCommandHandler {
+class InspectorHeapProfilerAgent : public InspectorBaseAgent, public InspectorBackendDispatcher::HeapProfilerCommandHandler {
     WTF_MAKE_NONCOPYABLE(InspectorHeapProfilerAgent); WTF_MAKE_FAST_ALLOCATED;
 public:
-    static PassOwnPtr<InspectorHeapProfilerAgent> create(InstrumentingAgents*, InspectorCompositeState*, InjectedScriptManager*);
+    static PassRefPtr<InspectorHeapProfilerAgent> create(InstrumentingAgents*, InspectorState*, InjectedScriptManager*);
     virtual ~InspectorHeapProfilerAgent();
 
     virtual void collectGarbage(ErrorString*);
     virtual void clearProfiles(ErrorString*);
 
     virtual void getProfileHeaders(ErrorString*, RefPtr<TypeBuilder::Array<TypeBuilder::HeapProfiler::ProfileHeader> >&);
     virtual void getHeapSnapshot(ErrorString*, int uid);
     virtual void removeProfile(ErrorString*, int uid);
     virtual void startTrackingHeapObjects(ErrorString*);
     virtual void stopTrackingHeapObjects(ErrorString*);
 
     virtual void setFrontend(InspectorFrontend*);
     virtual void clearFrontend();
     virtual void restore();
 
     virtual void takeHeapSnapshot(ErrorString*, const bool* reportProgress);
 
     virtual void getObjectByHeapObjectId(ErrorString*, const String& heapSnapshotObjectId, const String* objectGroup, RefPtr<TypeBuilder::Runtime::RemoteObject>& result);
     virtual void getHeapObjectId(ErrorString*, const String& objectId, String* heapSnapshotObjectId);
 
     virtual void reportMemoryUsage(MemoryObjectInfo*) const OVERRIDE;
 
 
 private:
     class HeapStatsStream;
     class HeapStatsUpdateTask;
 
-    InspectorHeapProfilerAgent(InstrumentingAgents*, InspectorCompositeState*, InjectedScriptManager*);
+    InspectorHeapProfilerAgent(InstrumentingAgents*, InspectorState*, InjectedScriptManager*);
 
     typedef HashMap<unsigned, RefPtr<ScriptHeapSnapshot> > IdToHeapSnapshotMap;
 
     void resetFrontendProfiles();
     void requestHeapStatsUpdate();
     void pushHeapStatsUpdate(const uint32_t* const data, const int size);
 
     PassRefPtr<TypeBuilder::HeapProfiler::ProfileHeader> createSnapshotHeader(const ScriptHeapSnapshot&);
 
     InjectedScriptManager* m_injectedScriptManager;
     InspectorFrontend::HeapProfiler* m_frontend;
     unsigned m_nextUserInitiatedHeapSnapshotNumber;
     IdToHeapSnapshotMap m_snapshots;
     OwnPtr<HeapStatsUpdateTask> m_heapStatsUpdateTask;
 };
 
+class InspectorHeapProfilerController: public InspectorBaseController<InspectorHeapProfilerController, InspectorHeapProfilerAgent> {
+public:
+
+    static PassOwnPtr<InspectorHeapProfilerController> create(InstrumentingAgents* instrumentingAgents, InspectorCompositeState* compositeState, InjectedScriptManager* injectedScriptManager)
+    {
+        return adoptPtr(new InspectorHeapProfilerController(instrumentingAgents, compositeState, injectedScriptManager));
+    }
+
+protected:
+    InspectorHeapProfilerController(InstrumentingAgents* instrumentingAgents, InspectorCompositeState* compositeState, InjectedScriptManager* injectedScriptManager)
+        : InspectorBaseController<InspectorHeapProfilerController, InspectorHeapProfilerAgent>("HeapProfiler", instrumentingAgents, compositeState)
+    {
+        setAgent(InspectorHeapProfilerAgent::create(m_instrumentingAgents, m_state, injectedScriptManager));
+    }
+};
+
 } // namespace WebCore
 
 
 #endif // !defined(InspectorHeapProfilerAgent_h)