Revert of Move ScriptState::GetExecutionContext (Part 5)

third_party/WebKit/Source/modules/battery/BatteryManager.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/BatteryManager.h"
 
 #include "core/dom/DOMException.h"
 #include "core/dom/Document.h"
-#include "core/dom/ExecutionContext.h"
 #include "core/events/Event.h"
 #include "modules/battery/BatteryDispatcher.h"
 #include "platform/wtf/Assertions.h"
 
 namespace blink {
 
 BatteryManager* BatteryManager::Create(ExecutionContext* context) {
   BatteryManager* battery_manager = new BatteryManager(context);
   battery_manager->SuspendIfNeeded();
   return battery_manager;
 }
 
 BatteryManager::~BatteryManager() {}
 
 BatteryManager::BatteryManager(ExecutionContext* context)
     : SuspendableObject(context),
       PlatformEventController(ToDocument(context)->GetFrame()) {}
 
 ScriptPromise BatteryManager::StartRequest(ScriptState* script_state) {
   if (!battery_property_) {
-    battery_property_ = new BatteryProperty(
-        ExecutionContext::From(script_state), this, BatteryProperty::kReady);
+    battery_property_ = new BatteryProperty(script_state->GetExecutionContext(),
+                                            this, BatteryProperty::kReady);
 
     // If the context is in a stopped state already, do not start updating.
     if (!GetExecutionContext() || GetExecutionContext()->IsContextDestroyed()) {
       battery_property_->Resolve(this);
     } else {
       has_event_listener_ = true;
       StartUpdating();
     }
   }
 
@@ skipping 77 matching lines @@
 }
 
 DEFINE_TRACE(BatteryManager) {
   visitor->Trace(battery_property_);
   PlatformEventController::Trace(visitor);
   EventTargetWithInlineData::Trace(visitor);
   SuspendableObject::Trace(visitor);
 }
 
 }  // namespace blink