Revert of Move ScriptState::GetExecutionContext (Part 5)

third_party/WebKit/Source/modules/battery/NavigatorBattery.cpp

 // 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.
 
 #include "modules/battery/NavigatorBattery.h"
 
-#include "core/dom/ExecutionContext.h"
 #include "core/frame/LocalFrame.h"
 #include "modules/battery/BatteryManager.h"
 
 namespace blink {
 
 NavigatorBattery::NavigatorBattery(Navigator& navigator)
     : Supplement<Navigator>(navigator) {}
 
 ScriptPromise NavigatorBattery::getBattery(ScriptState* script_state,
                                            Navigator& navigator) {
   return NavigatorBattery::From(navigator).getBattery(script_state);
 }
 
 ScriptPromise NavigatorBattery::getBattery(ScriptState* script_state) {
-  if (!battery_manager_) {
+  if (!battery_manager_)
     battery_manager_ =
-        BatteryManager::Create(ExecutionContext::From(script_state));
-  }
+        BatteryManager::Create(script_state->GetExecutionContext());
+
   return battery_manager_->StartRequest(script_state);
 }
 
 const char* NavigatorBattery::SupplementName() {
   return "NavigatorBattery";
 }
 
 NavigatorBattery& NavigatorBattery::From(Navigator& navigator) {
   NavigatorBattery* supplement = static_cast<NavigatorBattery*>(
       Supplement<Navigator>::From(navigator, SupplementName()));
   if (!supplement) {
     supplement = new NavigatorBattery(navigator);
     ProvideTo(navigator, SupplementName(), supplement);
   }
   return *supplement;
 }
 
 DEFINE_TRACE(NavigatorBattery) {
   visitor->Trace(battery_manager_);
   Supplement<Navigator>::Trace(visitor);
 }
 
 }  // namespace blink