Inspector: wrapped inspector agent instances into factory-like wrappers

Source/core/inspector/InspectorDatabaseAgent.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 30 matching lines @@
 class DocumentLoader;
 class Frame;
 class InspectorArray;
 class InspectorDatabaseResource;
 class InspectorFrontend;
 class InspectorState;
 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();
 
     virtual void setFrontend(InspectorFrontend*);
     virtual void clearFrontend();
     virtual void restore();
 
     void didCommitLoad(Frame*, DocumentLoader*);
 
     // Called from the front-end.
     virtual void enable(ErrorString*);
     virtual void disable(ErrorString*);
     virtual void getDatabaseTableNames(ErrorString*, const String& databaseId, RefPtr<TypeBuilder::Array<String> >& names);
     virtual void executeSQL(ErrorString*, const String& databaseId, const String& query, PassRefPtr<ExecuteSQLCallback>);
 
     // Called from the injected script.
     String databaseId(Database*);
 
     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);
 
     InspectorFrontend::Database* m_frontend;
     typedef HashMap<String, RefPtr<InspectorDatabaseResource> > DatabaseResourcesMap;
     DatabaseResourcesMap m_resources;
     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)