Revert of Move ScriptState::GetExecutionContext (Part 5)

third_party/WebKit/Source/modules/app_banner/BeforeInstallPromptEvent.cpp

 // Copyright 2015 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/app_banner/BeforeInstallPromptEvent.h"
 
 #include "core/dom/DOMException.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExceptionCode.h"
-#include "core/dom/ExecutionContext.h"
 #include "core/frame/UseCounter.h"
 #include "modules/app_banner/BeforeInstallPromptEventInit.h"
 
 namespace blink {
 
 BeforeInstallPromptEvent::BeforeInstallPromptEvent(
     const AtomicString& name,
     LocalFrame& frame,
     mojom::blink::AppBannerServicePtr service_ptr,
     mojom::blink::AppBannerEventRequest event_request,
@@ skipping 24 matching lines @@
 void BeforeInstallPromptEvent::Dispose() {
   banner_service_.reset();
   binding_.Close();
 }
 
 Vector<String> BeforeInstallPromptEvent::platforms() const {
   return platforms_;
 }
 
 ScriptPromise BeforeInstallPromptEvent::userChoice(ScriptState* script_state) {
-  UseCounter::Count(ExecutionContext::From(script_state),
+  UseCounter::Count(script_state->GetExecutionContext(),
                     UseCounter::kBeforeInstallPromptEventUserChoice);
   // |m_binding| must be bound to allow the AppBannerService to resolve the
   // userChoice promise.
   if (user_choice_ && binding_.is_bound())
     return user_choice_->Promise(script_state->World());
   return ScriptPromise::RejectWithDOMException(
       script_state,
       DOMException::Create(kInvalidStateError,
                            "userChoice cannot be accessed on this event."));
 }
 
 ScriptPromise BeforeInstallPromptEvent::prompt(ScriptState* script_state) {
   // |m_bannerService| must be bound to allow us to inform the AppBannerService
   // to display the banner now.
   if (!defaultPrevented() || prompt_called_ || !banner_service_.is_bound()) {
     return ScriptPromise::RejectWithDOMException(
         script_state,
         DOMException::Create(kInvalidStateError,
                              "The prompt() method may only be called once, "
                              "following preventDefault()."));
   }
 
-  UseCounter::Count(ExecutionContext::From(script_state),
+  UseCounter::Count(script_state->GetExecutionContext(),
                     UseCounter::kBeforeInstallPromptEventPrompt);
 
   prompt_called_ = true;
   banner_service_->DisplayAppBanner();
   return ScriptPromise::CastUndefined(script_state);
 }
 
 const AtomicString& BeforeInstallPromptEvent::InterfaceName() const {
   return EventNames::BeforeInstallPromptEvent;
 }
@@ skipping 15 matching lines @@
   user_choice_->Resolve(AppBannerPromptResult::Create(
       g_empty_atom, AppBannerPromptResult::Outcome::kDismissed));
 }
 
 DEFINE_TRACE(BeforeInstallPromptEvent) {
   visitor->Trace(user_choice_);
   Event::Trace(visitor);
 }
 
 }  // namespace blink