Oilpan: Remove WillBe types (part 7)

third_party/WebKit/Source/core/frame/EventHandlerRegistry.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef EventHandlerRegistry_h
 #define EventHandlerRegistry_h
 
 #include "core/CoreExport.h"
 #include "core/frame/FrameHost.h"
 #include "wtf/HashCountedSet.h"
 
 namespace blink {
 
 class Document;
 class EventListenerOptions;
 class EventTarget;
 
-typedef HashCountedSet<RawPtrWillBeUntracedMember<EventTarget>> EventTargetSet;
+typedef HashCountedSet<UntracedMember<EventTarget>> EventTargetSet;
 
 // Registry for keeping track of event handlers. Note that only handlers on
 // documents that can be rendered or can receive input (i.e., are attached to a
 // FrameHost) are registered here.
-class CORE_EXPORT EventHandlerRegistry final : public NoBaseWillBeGarbageCollectedFinalized<EventHandlerRegistry> {
-    USING_FAST_MALLOC_WILL_BE_REMOVED(EventHandlerRegistry);
+class CORE_EXPORT EventHandlerRegistry final : public GarbageCollectedFinalized<EventHandlerRegistry> {
 public:
     explicit EventHandlerRegistry(FrameHost&);
     virtual ~EventHandlerRegistry();
 
     // Supported event handler classes. Note that each one may correspond to
     // multiple event types.
     enum EventHandlerClass {
         ScrollEvent,
         WheelEventBlocking,
         WheelEventPassive,
@@ skipping 60 matching lines @@
     // Record a change operation to a given event handler class and notify any
     // parent registry and other clients accordingly.
     void updateEventHandlerOfType(ChangeOperation, const AtomicString& eventType, const EventListenerOptions&, EventTarget*);
 
     void updateEventHandlerInternal(ChangeOperation, EventHandlerClass, EventTarget*);
 
     void updateAllEventHandlers(ChangeOperation, EventTarget&);
 
     void checkConsistency() const;
 
-    RawPtrWillBeMember<FrameHost> m_frameHost;
+    Member<FrameHost> m_frameHost;
     EventTargetSet m_targets[EventHandlerClassCount];
 };
 
 } // namespace blink
 
 #endif // EventHandlerRegistry_h