Oilpan: avoid InjectedScriptManager::CallbackData-induced leaks.

Source/core/inspector/InjectedScriptManager.h

 /*
  * Copyright (C) 2007 Apple Inc. All rights reserved.
  * Copyright (C) 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 29 matching lines @@
 
 class InjectedScript;
 class InjectedScriptHost;
 class InjectedScriptNative;
 class ScriptValue;
 
 class InjectedScriptManager : public NoBaseWillBeGarbageCollectedFinalized<InjectedScriptManager> {
     WTF_MAKE_NONCOPYABLE(InjectedScriptManager);
     WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(InjectedScriptManager);
 public:
-    struct CallbackData {
+    class CallbackData final : public NoBaseWillBeGarbageCollectedFinalized<CallbackData> {
+    public:
+        static PassOwnPtrWillBeRawPtr<CallbackData> create(InjectedScriptManager*);
+        void dispose();
+        DECLARE_TRACE();
+
         ScopedPersistent<v8::Object> handle;
-        RefPtrWillBePersistent<InjectedScriptHost> host;
-        InjectedScriptManager* injectedScriptManager;
+        RefPtrWillBeMember<InjectedScriptHost> host;
+        RawPtrWillBeMember<InjectedScriptManager> injectedScriptManager;
+    private:
+        explicit CallbackData(InjectedScriptManager*);
     };
 
     static PassOwnPtrWillBeRawPtr<InjectedScriptManager> createForPage();
     static PassOwnPtrWillBeRawPtr<InjectedScriptManager> createForWorker();
     ~InjectedScriptManager();
     DECLARE_TRACE();
 
     void disconnect();
 
     InjectedScriptHost* injectedScriptHost();
@@ skipping 23 matching lines @@
     static bool canAccessInspectedWindow(ScriptState*);
     static bool canAccessInspectedWorkerGlobalScope(ScriptState*);
 
     int m_nextInjectedScriptId;
     typedef HashMap<int, InjectedScript> IdToInjectedScriptMap;
     IdToInjectedScriptMap m_idToInjectedScript;
     RefPtrWillBeMember<InjectedScriptHost> m_injectedScriptHost;
     InspectedStateAccessCheck m_inspectedStateAccessCheck;
     typedef HashMap<RefPtr<ScriptState>, int> ScriptStateToId;
     ScriptStateToId m_scriptStateToId;
-    HashSet<OwnPtr<CallbackData> > m_callbackDataSet;
+    WillBeHeapHashSet<OwnPtrWillBeMember<CallbackData>> m_callbackDataSet;
     bool m_customObjectFormatterEnabled;
 };
 
 } // namespace blink
 
 #endif // !defined(InjectedScriptManager_h)