Revert of Move ScriptState::GetExecutionContext (Part 5)

third_party/WebKit/Source/modules/vr/NavigatorVR.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/vr/NavigatorVR.h"
 
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExceptionCode.h"
-#include "core/dom/ExecutionContext.h"
 #include "core/dom/Fullscreen.h"
 #include "core/frame/LocalDOMWindow.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Navigator.h"
 #include "core/frame/UseCounter.h"
 #include "core/page/Page.h"
 #include "modules/vr/VRController.h"
 #include "modules/vr/VRDisplay.h"
 #include "modules/vr/VRGetDevicesCallback.h"
 #include "modules/vr/VRPose.h"
@@ skipping 45 matching lines @@
 ScriptPromise NavigatorVR::getVRDisplays(ScriptState* script_state) {
   ScriptPromiseResolver* resolver = ScriptPromiseResolver::Create(script_state);
   ScriptPromise promise = resolver->Promise();
 
   if (!GetDocument()) {
     RejectNavigatorDetached(resolver);
     return promise;
   }
 
   UseCounter::Count(*GetDocument(), UseCounter::kVRGetDisplays);
-  ExecutionContext* execution_context = ExecutionContext::From(script_state);
+  ExecutionContext* execution_context = script_state->GetExecutionContext();
   if (!execution_context->IsSecureContext())
     UseCounter::Count(*GetDocument(), UseCounter::kVRGetDisplaysInsecureOrigin);
 
   Platform::Current()->RecordRapporURL("VR.WebVR.GetDisplays",
                                        GetDocument()->Url());
 
   Controller()->GetDisplays(resolver);
 
   return promise;
 }
@@ skipping 93 matching lines @@
 
 void NavigatorVR::DidRemoveAllEventListeners(LocalDOMWindow* window) {
   if (!controller_)
     return;
 
   controller_->SetListeningForActivate(false);
   listening_for_activate_ = false;
 }
 
 }  // namespace blink