Inspector: wrapped inspector agent instances into factory-like wrappers

Source/core/inspector/InspectorFileSystemAgent.h

 /*
  * Copyright (C) 2011, 2012 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 22 matching lines @@
 
 #include "core/inspector/InspectorBaseAgent.h"
 
 #include <wtf/PassOwnPtr.h>
 #include <wtf/PassRefPtr.h>
 
 namespace WebCore {
 
 class InspectorFrontend;
 class InspectorPageAgent;
+class InspectorPageController;
 class ScriptExecutionContext;
 class SecurityOrigin;
 
-class InspectorFileSystemAgent : public InspectorBaseAgent<InspectorFileSystemAgent>, public InspectorBackendDispatcher::FileSystemCommandHandler {
+class InspectorFileSystemAgent : public InspectorBaseAgent, public InspectorBackendDispatcher::FileSystemCommandHandler {
 public:
-    static PassOwnPtr<InspectorFileSystemAgent> create(InstrumentingAgents*, InspectorPageAgent*, InspectorCompositeState*);
+    static PassRefPtr<InspectorFileSystemAgent> create(InstrumentingAgents*, InspectorState*, PassRefPtr<InspectorPageAgent>);
     virtual ~InspectorFileSystemAgent();
 
     virtual void enable(ErrorString*) OVERRIDE;
     virtual void disable(ErrorString*) OVERRIDE;
 
     virtual void requestFileSystemRoot(ErrorString*, const String& origin, const String& typeString, PassRefPtr<RequestFileSystemRootCallback>) OVERRIDE;
     virtual void requestDirectoryContent(ErrorString*, const String& url, PassRefPtr<RequestDirectoryContentCallback>) OVERRIDE;
     virtual void requestMetadata(ErrorString*, const String& url, PassRefPtr<RequestMetadataCallback>) OVERRIDE;
     virtual void requestFileContent(ErrorString*, const String& url, bool readAsText, const int* start, const int* end, const String* charset, PassRefPtr<RequestFileContentCallback>) OVERRIDE;
     virtual void deleteEntry(ErrorString*, const String& url, PassRefPtr<DeleteEntryCallback>) OVERRIDE;
 
     virtual void clearFrontend() OVERRIDE;
     virtual void restore() OVERRIDE;
 
 private:
-    InspectorFileSystemAgent(InstrumentingAgents*, InspectorPageAgent*, InspectorCompositeState*);
+    InspectorFileSystemAgent(InstrumentingAgents*, InspectorState*, PassRefPtr<InspectorPageAgent>);
     bool assertEnabled(ErrorString*);
     ScriptExecutionContext* assertScriptExecutionContextForOrigin(ErrorString*, SecurityOrigin*);
 
-    InspectorPageAgent* m_pageAgent;
+    RefPtr<InspectorPageAgent> m_pageAgent;
     bool m_enabled;
 };
 
+class InspectorFileSystemController: public InspectorBaseController<InspectorFileSystemController, InspectorFileSystemAgent> {
+public:
+
+    static PassOwnPtr<InspectorFileSystemController> create(InstrumentingAgents* instrumentingAgents, InspectorCompositeState* compositeState, InspectorPageController* pageController)
+    {
+        return adoptPtr(new InspectorFileSystemController(instrumentingAgents, compositeState, pageController));
+    }
+
+protected:
+    InspectorFileSystemController(InstrumentingAgents*, InspectorCompositeState*, InspectorPageController*);
+};
+
 } // namespace WebCore
 
 #endif // InspectorFileSystemAgent_h