Return same promise consistently when using navigator.getBattery()

Source/modules/battery/BatteryManager.h

Index: Source/modules/battery/BatteryManager.h
diff --git a/Source/modules/battery/BatteryManager.h b/Source/modules/battery/BatteryManager.h
index 66d25f4f1d7cf0bd29ae765b4f59b720291b8251..0d99524bc573b2925e3373ff47b1eaf676f58e65 100644
--- a/Source/modules/battery/BatteryManager.h
+++ b/Source/modules/battery/BatteryManager.h
@@ -6,7 +6,8 @@
 #define BatteryManager_h
 
 #include "bindings/core/v8/ScriptPromise.h"
-#include "bindings/core/v8/ScriptPromiseResolver.h"
+#include "bindings/core/v8/ScriptPromiseProperty.h"
+#include "core/dom/ActiveDOMObject.h"
 #include "core/dom/ContextLifecycleObserver.h"
 #include "core/frame/PlatformEventController.h"
 #include "modules/EventTargetModules.h"
@@ -56,17 +57,11 @@ public:
     DECLARE_VIRTUAL_TRACE();
 
 private:
-    enum State {
-        NotStarted,
-        Pending,
-        Resolved,
-    };
-
     explicit BatteryManager(ExecutionContext*);
 
-    RefPtrWillBeMember<ScriptPromiseResolver> m_resolver;
+    using BatteryProperty = ScriptPromiseProperty<Member<BatteryManager>, Member<BatteryManager>, RefPtrWillBeMember<DOMException>>;
+    Member<BatteryProperty> m_batteryProperty;
     Member<BatteryStatus> m_batteryStatus;
-    State m_state;
 };
 
 } // namespace blink