Revert of Move ScriptState::GetExecutionContext (Part 5)

third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.cpp

 /*
  * Copyright (C) 2013 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 17 matching lines @@
 #include <cmath>
 #include <limits>
 #include "bindings/core/v8/DOMWrapperWorld.h"
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "bindings/core/v8/V8ThrowException.h"
 #include "core/dom/DOMArrayBuffer.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/ExceptionCode.h"
-#include "core/dom/ExecutionContext.h"
 #include "core/dom/TaskRunnerHelper.h"
 #include "core/events/Event.h"
 #include "core/events/GenericEventQueue.h"
 #include "modules/encryptedmedia/ContentDecryptionModuleResultPromise.h"
 #include "modules/encryptedmedia/EncryptedMediaUtils.h"
 #include "modules/encryptedmedia/MediaKeyMessageEvent.h"
 #include "modules/encryptedmedia/MediaKeys.h"
 #include "platform/ContentDecryptionModuleResult.h"
 #include "platform/InstanceCounters.h"
 #include "platform/Timer.h"
@@ skipping 310 matching lines @@
 MediaKeySession* MediaKeySession::Create(
     ScriptState* script_state,
     MediaKeys* media_keys,
     WebEncryptedMediaSessionType session_type) {
   return new MediaKeySession(script_state, media_keys, session_type);
 }
 
 MediaKeySession::MediaKeySession(ScriptState* script_state,
                                  MediaKeys* media_keys,
                                  WebEncryptedMediaSessionType session_type)
-    : ContextLifecycleObserver(ExecutionContext::From(script_state)),
+    : ContextLifecycleObserver(script_state->GetExecutionContext()),
       async_event_queue_(GenericEventQueue::Create(this)),
       media_keys_(media_keys),
       session_type_(session_type),
       expiration_(std::numeric_limits<double>::quiet_NaN()),
       key_statuses_map_(new MediaKeyStatusMap()),
       is_uninitialized_(true),
       is_callable_(false),
       is_closed_(false),
-      closed_promise_(new ClosedPromise(ExecutionContext::From(script_state),
+      closed_promise_(new ClosedPromise(script_state->GetExecutionContext(),
                                         this,
                                         ClosedPromise::kClosed)),
       action_timer_(
           TaskRunnerHelper::Get(TaskType::kMiscPlatformAPI, script_state),
           this,
           &MediaKeySession::ActionTimerFired) {
   DVLOG(MEDIA_KEY_SESSION_LOG_LEVEL) << __func__ << "(" << this << ")";
   InstanceCounters::IncrementCounter(InstanceCounters::kMediaKeySessionCounter);
 
   // Create the matching Chromium object. It will not be usable until
@@ skipping 663 matching lines @@
   visitor->Trace(async_event_queue_);
   visitor->Trace(pending_actions_);
   visitor->Trace(media_keys_);
   visitor->Trace(key_statuses_map_);
   visitor->Trace(closed_promise_);
   EventTargetWithInlineData::Trace(visitor);
   ContextLifecycleObserver::Trace(visitor);
 }
 
 }  // namespace blink