Inspector: wrapped inspector agent instances into factory-like wrappers

Source/core/inspector/InspectorProfilerAgent.h

 /*
  * Copyright (C) 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2010 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 26 matching lines @@
 #include <wtf/HashMap.h>
 #include <wtf/Noncopyable.h>
 #include <wtf/PassOwnPtr.h>
 #include <wtf/text/WTFString.h>
 
 namespace WebCore {
 
 class InjectedScriptManager;
 class InspectorArray;
 class InspectorConsoleAgent;
+class InspectorConsoleController;
 class InspectorFrontend;
 class InspectorObject;
 class InspectorState;
 class InstrumentingAgents;
 class Page;
 class ScriptCallStack;
 class ScriptProfile;
 class WorkerContext;
 
 typedef String ErrorString;
 
-class InspectorProfilerAgent : public InspectorBaseAgent<InspectorProfilerAgent>, public InspectorBackendDispatcher::ProfilerCommandHandler {
+class InspectorProfilerAgent : public InspectorBaseAgent, public InspectorBackendDispatcher::ProfilerCommandHandler {
     WTF_MAKE_NONCOPYABLE(InspectorProfilerAgent); WTF_MAKE_FAST_ALLOCATED;
 public:
-    static PassOwnPtr<InspectorProfilerAgent> create(InstrumentingAgents*, InspectorConsoleAgent*, InspectorCompositeState*, InjectedScriptManager*);
+    static PassRefPtr<InspectorProfilerAgent> create(InstrumentingAgents*, InspectorState*, PassRefPtr<InspectorConsoleAgent>, InjectedScriptManager*);
     virtual ~InspectorProfilerAgent();
 
     void addProfile(PassRefPtr<ScriptProfile> prpProfile, PassRefPtr<ScriptCallStack>);
     void addProfileFinishedMessageToConsole(PassRefPtr<ScriptProfile>, unsigned lineNumber, const String& sourceURL);
     void addStartProfilingMessageToConsole(const String& title, unsigned lineNumber, const String& sourceURL);
     virtual void clearProfiles(ErrorString*);
 
     virtual void enable(ErrorString*);
     virtual void disable(ErrorString*);
     virtual void start(ErrorString* = 0);
@@ skipping 10 matching lines @@
     virtual void restore();
 
     void toggleRecordButton(bool isProfiling);
 
     virtual void reportMemoryUsage(MemoryObjectInfo*) const OVERRIDE;
 
     void willProcessTask();
     void didProcessTask();
 
 private:
-    InspectorProfilerAgent(InstrumentingAgents*, InspectorConsoleAgent*, InspectorCompositeState*, InjectedScriptManager*);
+    InspectorProfilerAgent(InstrumentingAgents*, InspectorState*, PassRefPtr<InspectorConsoleAgent>, InjectedScriptManager*);
 
     void addProfile(PassRefPtr<ScriptProfile> prpProfile, unsigned lineNumber, const String& sourceURL);
 
     void resetFrontendProfiles();
     PassRefPtr<TypeBuilder::Profiler::ProfileHeader> stop(ErrorString* = 0);
 
     PassRefPtr<TypeBuilder::Profiler::ProfileHeader> createProfileHeader(const ScriptProfile&);
 
-    InspectorConsoleAgent* m_consoleAgent;
+    RefPtr<InspectorConsoleAgent> m_consoleAgent;
     InjectedScriptManager* m_injectedScriptManager;
     InspectorFrontend::Profiler* m_frontend;
     bool m_recordingCPUProfile;
     int m_currentUserInitiatedProfileNumber;
     unsigned m_nextUserInitiatedProfileNumber;
     typedef HashMap<unsigned, RefPtr<ScriptProfile> > ProfilesMap;
     ProfilesMap m_profiles;
 
     typedef HashMap<String, double> ProfileNameIdleTimeMap;
     ProfileNameIdleTimeMap* m_profileNameIdleTimeMap;
     double m_previousTaskEndTime;
 };
 
+class InspectorProfilerController: public InspectorBaseController<InspectorProfilerController, InspectorProfilerAgent> {
+public:
+
+    static PassOwnPtr<InspectorProfilerController> create(InstrumentingAgents* instrumentingAgents, InspectorCompositeState* compositeState, InspectorConsoleController* consoleController, InjectedScriptManager* injectedScriptManager)
+    {
+        return adoptPtr(new InspectorProfilerController(instrumentingAgents, compositeState, consoleController, injectedScriptManager));
+    }
+
+protected:
+    InspectorProfilerController(InstrumentingAgents*, InspectorCompositeState*, InspectorConsoleController*, InjectedScriptManager*);
+};
+
 } // namespace WebCore
 
 
 #endif // !defined(InspectorProfilerAgent_h)