Inspector: wrapped inspector agent instances into factory-like wrappers

Source/core/inspector/InspectorDOMStorageAgent.h

 /*
  * 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.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 23 matching lines @@
 #include <wtf/HashMap.h>
 #include <wtf/PassOwnPtr.h>
 #include <wtf/text/WTFString.h>
 
 namespace WebCore {
 
 class Frame;
 class InspectorArray;
 class InspectorFrontend;
 class InspectorPageAgent;
+class InspectorPageFactory;
 class InspectorState;
 class InstrumentingAgents;
 class Page;
 class Storage;
 class StorageArea;
 
 typedef String ErrorString;
 
-class InspectorDOMStorageAgent : public InspectorBaseAgent<InspectorDOMStorageAgent>, public InspectorBackendDispatcher::DOMStorageCommandHandler {
+class InspectorDOMStorageAgent : public InspectorBaseAgent, public InspectorBackendDispatcher::DOMStorageCommandHandler {
 public:
-    static PassOwnPtr<InspectorDOMStorageAgent> create(InstrumentingAgents* instrumentingAgents, InspectorPageAgent* pageAgent, InspectorCompositeState* state)
-    {
-        return adoptPtr(new InspectorDOMStorageAgent(instrumentingAgents, pageAgent, state));
-    }
-    ~InspectorDOMStorageAgent();
+    static PassRefPtr<InspectorDOMStorageAgent> create(InstrumentingAgents*, InspectorState*, PassRefPtr<InspectorPageAgent>);
+    virtual ~InspectorDOMStorageAgent();
 
     virtual void setFrontend(InspectorFrontend*);
     virtual void clearFrontend();
 
     // Called from the front-end.
     virtual void enable(ErrorString*);
     virtual void disable(ErrorString*);
     virtual void getDOMStorageItems(ErrorString*, const RefPtr<InspectorObject>& storageId, RefPtr<TypeBuilder::Array<TypeBuilder::Array<String> > >& items);
     virtual void setDOMStorageItem(ErrorString*, const RefPtr<InspectorObject>& storageId, const String& key, const String& value);
     virtual void removeDOMStorageItem(ErrorString*, const RefPtr<InspectorObject>& storageId, const String& key);
 
     // Called from the injected script.
     String storageId(Storage*);
     PassRefPtr<TypeBuilder::DOMStorage::StorageId> storageId(SecurityOrigin*, bool isLocalStorage);
 
     // Called from InspectorInstrumentation
     void didDispatchDOMStorageEvent(const String& key, const String& oldValue, const String& newValue, StorageType, SecurityOrigin*);
 
     virtual void reportMemoryUsage(MemoryObjectInfo*) const OVERRIDE;
 
 private:
 
-    InspectorDOMStorageAgent(InstrumentingAgents*, InspectorPageAgent*, InspectorCompositeState*);
+    InspectorDOMStorageAgent(InstrumentingAgents*, InspectorState*, PassRefPtr<InspectorPageAgent>);
 
     bool isEnabled() const;
     PassRefPtr<StorageArea> findStorageArea(ErrorString*, const RefPtr<InspectorObject>&, Frame*&);
 
-    InspectorPageAgent* m_pageAgent;
+    RefPtr<InspectorPageAgent> m_pageAgent;
     InspectorFrontend* m_frontend;
 };
 
+class InspectorDOMStorageFactory : public InspectorBaseFactory<InspectorDOMStorageFactory, InspectorDOMStorageAgent> {
+public:
+
+    static PassOwnPtr<InspectorDOMStorageFactory> create(InstrumentingAgents* instrumentingAgents, InspectorCompositeState* compositeState, InspectorPageFactory* pageFactory)
+    {
+        return adoptPtr(new InspectorDOMStorageFactory(instrumentingAgents, compositeState, pageFactory));
+    }
+
+protected:
+    InspectorDOMStorageFactory(InstrumentingAgents*, InspectorCompositeState*, InspectorPageFactory*);
+};
+
 } // namespace WebCore
 
 #endif // !defined(InspectorDOMStorageAgent_h)