Clean up macros around DEFINE_EVENT_TARGET_REFCOUNTING

Source/modules/battery/BatteryManager.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 BatteryManager_h
 #define BatteryManager_h
 
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "core/dom/ContextLifecycleObserver.h"
 #include "core/frame/PlatformEventController.h"
 #include "modules/EventTargetModules.h"
 #include "platform/heap/Handle.h"
 
 namespace blink {
 
 class BatteryStatus;
 
 class BatteryManager final : public RefCountedGarbageCollectedEventTargetWithInlineData<BatteryManager>, public ActiveDOMObject, public PlatformEventController {
-    DEFINE_EVENT_TARGET_REFCOUNTING_WILL_BE_REMOVED(RefCountedGarbageCollected<BatteryManager>);
+    REFCOUNTED_GARBAGE_COLLECTED_EVENT_TARGET(BatteryManager);
     DEFINE_WRAPPERTYPEINFO();
     WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(BatteryManager);
 public:
     static BatteryManager* create(ExecutionContext*);
     virtual ~BatteryManager();
 
     // Returns a promise object that will be resolved with this BatteryManager.
     ScriptPromise startRequest(ScriptState*);
 
     // EventTarget implementation.
@@ skipping 34 matching lines @@
     explicit BatteryManager(ExecutionContext*);
 
     RefPtrWillBeMember<ScriptPromiseResolver> m_resolver;
     Member<BatteryStatus> m_batteryStatus;
     State m_state;
 };
 
 } // namespace blink
 
 #endif // BatteryManager_h