Inspector: wrapped inspector agent instances into factory-like wrappers

Source/core/inspector/InspectorFileSystemAgent.cpp

 /*
  * 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 582 matching lines @@
 
 bool DeleteEntryRequest::didDeleteEntry()
 {
     reportResult(static_cast<FileError::ErrorCode>(0));
     return true;
 }
 
 } // anonymous namespace
 
 // static
-PassOwnPtr<InspectorFileSystemAgent> InspectorFileSystemAgent::create(InstrumentingAgents* instrumentingAgents, InspectorPageAgent* pageAgent, InspectorCompositeState* state)
+PassRefPtr<InspectorFileSystemAgent> InspectorFileSystemAgent::create(InstrumentingAgents* instrumentingAgents, InspectorState* state, PassRefPtr<InspectorPageAgent> pageAgent)
 {
-    return adoptPtr(new InspectorFileSystemAgent(instrumentingAgents, pageAgent, state));
+    return adoptRef(new InspectorFileSystemAgent(instrumentingAgents, state, pageAgent));
 }
 
 InspectorFileSystemAgent::~InspectorFileSystemAgent()
 {
 }
 
 void InspectorFileSystemAgent::enable(ErrorString*)
 {
     if (m_enabled)
         return;
@@ skipping 77 matching lines @@
 {
     m_enabled = false;
     m_state->setBoolean(FileSystemAgentState::fileSystemAgentEnabled, m_enabled);
 }
 
 void InspectorFileSystemAgent::restore()
 {
     m_enabled = m_state->getBoolean(FileSystemAgentState::fileSystemAgentEnabled);
 }
 
-InspectorFileSystemAgent::InspectorFileSystemAgent(InstrumentingAgents* instrumentingAgents, InspectorPageAgent* pageAgent, InspectorCompositeState* state)
-    : InspectorBaseAgent<InspectorFileSystemAgent>("FileSystem", instrumentingAgents, state)
+InspectorFileSystemAgent::InspectorFileSystemAgent(InstrumentingAgents* instrumentingAgents, InspectorState* state, PassRefPtr<InspectorPageAgent> pageAgent)
+    : InspectorBaseAgent(instrumentingAgents, state)
     , m_pageAgent(pageAgent)
     , m_enabled(false)
 {
     ASSERT(instrumentingAgents);
     ASSERT(state);
     ASSERT(m_pageAgent);
 }
 
 bool InspectorFileSystemAgent::assertEnabled(ErrorString* error)
 {
     if (!m_enabled) {
         *error = "FileSystem agent is not enabled.";
         return false;
     }
     return true;
 }
 
 ScriptExecutionContext* InspectorFileSystemAgent::assertScriptExecutionContextForOrigin(ErrorString* error, SecurityOrigin* origin)
 {
     for (Frame* frame = m_pageAgent->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
         if (frame->document() && frame->document()->securityOrigin()->isSameSchemeHostPort(origin))
             return frame->document();
     }
 
     *error = "No frame is available for the request";
     return 0;
 }
 
+InspectorFileSystemController::InspectorFileSystemController(InstrumentingAgents* instrumentingAgents, InspectorCompositeState* compositeState, InspectorPageController* pageController)
+    : InspectorBaseController<InspectorFileSystemController, InspectorFileSystemAgent>("FileSystem", instrumentingAgents, compositeState)
+{
+    setAgent(InspectorFileSystemAgent::create(m_instrumentingAgents, m_state, pageController->getAgent()));
+}
+
 } // namespace WebCore