Oilpan: Prepare moving InspectorController and InspectorAgents to oilpan.

Source/core/inspector/InspectorBaseAgent.h

 /*
  * Copyright (C) 2011 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 14 matching lines @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef InspectorBaseAgent_h
 #define InspectorBaseAgent_h
 
 #include "core/InspectorBackendDispatcher.h"
+#include "core/inspector/InstrumentingAgents.h"
+#include "platform/heap/Handle.h"
 #include "wtf/Forward.h"
 #include "wtf/Vector.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 
 class InspectorFrontend;
 class InspectorCompositeState;
 class InspectorState;
 class InstrumentingAgents;
 
-class InspectorAgent {
+class InspectorAgent : public NoBaseWillBeGarbageCollectedFinalized<InspectorAgent> {
 public:
     explicit InspectorAgent(const String&);
     virtual ~InspectorAgent();
+    virtual void trace(Visitor*);
 
     virtual void init() { }
     virtual void setFrontend(InspectorFrontend*) { }
     virtual void clearFrontend() { }
     virtual void restore() { }
     virtual void registerInDispatcher(InspectorBackendDispatcher*) = 0;
     virtual void discardAgent() { }
     virtual void didCommitLoadForMainFrame() { }
     virtual void flushPendingFrontendMessages() { }
 
     String name() { return m_name; }
     void appended(InstrumentingAgents*, InspectorState*);
 
 protected:
-    InstrumentingAgents* m_instrumentingAgents;
+    RawPtrWillBeMember<InstrumentingAgents> m_instrumentingAgents;
+    // FIXME: Oilpan: Move InspectorState to heap in follow-up CL.
     InspectorState* m_state;
 
 private:
     String m_name;
 };
 
-class InspectorAgentRegistry {
+class InspectorAgentRegistry FINAL {
+    DISALLOW_ALLOCATION();
 public:
     InspectorAgentRegistry(InstrumentingAgents*, InspectorCompositeState*);
-    void append(PassOwnPtr<InspectorAgent>);
+    void append(PassOwnPtrWillBeRawPtr<InspectorAgent>);
 
     void setFrontend(InspectorFrontend*);
     void clearFrontend();
     void restore();
     void registerInDispatcher(InspectorBackendDispatcher*);
     void discardAgents();
     void flushPendingFrontendMessages();
     void didCommitLoadForMainFrame();
 
+    void trace(Visitor*);
+
 private:
-    InstrumentingAgents* m_instrumentingAgents;
+    RawPtrWillBeMember<InstrumentingAgents> m_instrumentingAgents;
+    // FIXME: Oilpan: Move InspectorCompositeState to heap in follow-up CL.
     InspectorCompositeState* m_inspectorState;
-    Vector<OwnPtr<InspectorAgent> > m_agents;
+    WillBeHeapVector<OwnPtrWillBeMember<InspectorAgent> > m_agents;
 };
 
 template<typename T>
 class InspectorBaseAgent : public InspectorAgent {
 public:
     virtual ~InspectorBaseAgent() { }
 
     virtual void registerInDispatcher(InspectorBackendDispatcher* dispatcher) OVERRIDE FINAL
     {
         dispatcher->registerAgent(static_cast<T*>(this));
     }
 
 protected:
-    InspectorBaseAgent(const String& name) : InspectorAgent(name)
+    explicit InspectorBaseAgent(const String& name) : InspectorAgent(name)
     {
     }
 };
 
 } // namespace blink
 
 #endif // !defined(InspectorBaseAgent_h)