Revert of Move ScriptState::GetExecutionContext (Part 5)

third_party/WebKit/Source/modules/mediastream/MediaDevices.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/mediastream/MediaDevices.h"
 
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExceptionCode.h"
-#include "core/dom/ExecutionContext.h"
 #include "core/events/Event.h"
 #include "modules/mediastream/MediaErrorState.h"
 #include "modules/mediastream/MediaStream.h"
 #include "modules/mediastream/MediaStreamConstraints.h"
 #include "modules/mediastream/NavigatorMediaStream.h"
 #include "modules/mediastream/NavigatorUserMediaErrorCallback.h"
 #include "modules/mediastream/NavigatorUserMediaSuccessCallback.h"
 #include "modules/mediastream/UserMediaController.h"
 
 namespace blink {
@@ skipping 48 matching lines @@
     : SuspendableObject(context),
       observing_(false),
       stopped_(false),
       dispatch_scheduled_event_runner_(AsyncMethodRunner<MediaDevices>::Create(
           this,
           &MediaDevices::DispatchScheduledEvent)) {}
 
 MediaDevices::~MediaDevices() {}
 
 ScriptPromise MediaDevices::enumerateDevices(ScriptState* script_state) {
-  Document* document = ToDocument(ExecutionContext::From(script_state));
+  Document* document = ToDocument(script_state->GetExecutionContext());
   UserMediaController* user_media =
       UserMediaController::From(document->GetFrame());
   if (!user_media)
     return ScriptPromise::RejectWithDOMException(
         script_state,
         DOMException::Create(kNotSupportedError,
                              "No media device controller available; is this a "
                              "detached window?"));
 
   MediaDevicesRequest* request =
       MediaDevicesRequest::Create(script_state, user_media);
   return request->Start();
 }
 
 ScriptPromise MediaDevices::getUserMedia(ScriptState* script_state,
                                          const MediaStreamConstraints& options,
                                          ExceptionState& exception_state) {
   ScriptPromiseResolver* resolver = ScriptPromiseResolver::Create(script_state);
 
   NavigatorUserMediaSuccessCallback* success_callback =
       new PromiseSuccessCallback(resolver);
   NavigatorUserMediaErrorCallback* error_callback =
       new PromiseErrorCallback(resolver);
 
-  Document* document = ToDocument(ExecutionContext::From(script_state));
+  Document* document = ToDocument(script_state->GetExecutionContext());
   UserMediaController* user_media =
       UserMediaController::From(document->GetFrame());
   if (!user_media)
     return ScriptPromise::RejectWithDOMException(
         script_state,
         DOMException::Create(kNotSupportedError,
                              "No media device controller available; is this a "
                              "detached window?"));
 
   MediaErrorState error_state;
@@ skipping 131 matching lines @@
 }
 
 DEFINE_TRACE(MediaDevices) {
   visitor->Trace(dispatch_scheduled_event_runner_);
   visitor->Trace(scheduled_events_);
   EventTargetWithInlineData::Trace(visitor);
   SuspendableObject::Trace(visitor);
 }
 
 }  // namespace blink