Inspector: wrapped inspector agent instances into factory-like wrappers

Source/core/inspector/InspectorDatabaseAgent.h

Index: Source/core/inspector/InspectorDatabaseAgent.h
diff --git a/Source/core/inspector/InspectorDatabaseAgent.h b/Source/core/inspector/InspectorDatabaseAgent.h
index 190e0043302e325dfe54d845e81217ded33ee334..e83cd673dad6355016d057fd92a9b8167dc8bb09 100644
--- a/Source/core/inspector/InspectorDatabaseAgent.h
+++ b/Source/core/inspector/InspectorDatabaseAgent.h
@@ -48,11 +48,11 @@ class InstrumentingAgents;
 
 typedef String ErrorString;
 
-class InspectorDatabaseAgent : public InspectorBaseAgent<InspectorDatabaseAgent>, public InspectorBackendDispatcher::DatabaseCommandHandler {
+class InspectorDatabaseAgent : public InspectorBaseAgent, public InspectorBackendDispatcher::DatabaseCommandHandler {
 public:
-    static PassOwnPtr<InspectorDatabaseAgent> create(InstrumentingAgents* instrumentingAgents, InspectorCompositeState* state)
+    static PassRefPtr<InspectorDatabaseAgent> create(InstrumentingAgents* instrumentingAgents, InspectorState* state)
     {
-        return adoptPtr(new InspectorDatabaseAgent(instrumentingAgents, state));
+        return adoptRef(new InspectorDatabaseAgent(instrumentingAgents, state));
     }
     ~InspectorDatabaseAgent();
 
@@ -73,7 +73,7 @@ public:
 
     void didOpenDatabase(PassRefPtr<Database>, const String& domain, const String& name, const String& version);
 private:
-    explicit InspectorDatabaseAgent(InstrumentingAgents*, InspectorCompositeState*);
+    explicit InspectorDatabaseAgent(InstrumentingAgents*, InspectorState*);
 
     Database* databaseForId(const String& databaseId);
     InspectorDatabaseResource* findByFileName(const String& fileName);
@@ -84,6 +84,22 @@ private:
     bool m_enabled;
 };
 
+class InspectorDatabaseController: public InspectorBaseController<InspectorDatabaseController, InspectorDatabaseAgent> {
+public:
+
+    static PassOwnPtr<InspectorDatabaseController> create(InstrumentingAgents* instrumentingAgents, InspectorCompositeState* compositeState)
+    {
+        return adoptPtr(new InspectorDatabaseController(instrumentingAgents, compositeState));
+    }
+
+protected:
+    InspectorDatabaseController(InstrumentingAgents* instrumentingAgents, InspectorCompositeState* compositeState)
+        : InspectorBaseController<InspectorDatabaseController, InspectorDatabaseAgent>("Database", instrumentingAgents, compositeState)
+    {
+        setAgent(InspectorDatabaseAgent::create(m_instrumentingAgents, m_state));
+    }
+};
+
 } // namespace WebCore
 
 #endif // !defined(InspectorDatabaseAgent_h)