Revert of Prefer using ContextClient over ContextLifecycleObserver

third_party/WebKit/Source/modules/presentation/PresentationRequest.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/presentation/PresentationRequest.h"
 
 #include "bindings/core/v8/CallbackPromiseAdapter.h"
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
@@ skipping 66 matching lines @@
   }
 
   return new PresentationRequest(executionContext, parsedUrl);
 }
 
 const AtomicString& PresentationRequest::interfaceName() const {
   return EventTargetNames::PresentationRequest;
 }
 
 ExecutionContext* PresentationRequest::getExecutionContext() const {
-  return ContextClient::getExecutionContext();
+  return ContextLifecycleObserver::getExecutionContext();
 }
 
 void PresentationRequest::addedEventListener(
     const AtomicString& eventType,
     RegisteredEventListener& registeredListener) {
   EventTargetWithInlineData::addedEventListener(eventType, registeredListener);
   if (eventType == EventTypeNames::connectionavailable)
     UseCounter::count(
         getExecutionContext(),
         UseCounter::PresentationRequestConnectionAvailableEventListener);
@@ skipping 100 matching lines @@
   return m_availabilityProperty->promise(scriptState->world());
 }
 
 const KURL& PresentationRequest::url() const {
   return m_url;
 }
 
 DEFINE_TRACE(PresentationRequest) {
   visitor->trace(m_availabilityProperty);
   EventTargetWithInlineData::trace(visitor);
-  ContextClient::trace(visitor);
+  ContextLifecycleObserver::trace(visitor);
 }
 
 PresentationRequest::PresentationRequest(ExecutionContext* executionContext,
                                          const KURL& url)
-    : ContextClient(executionContext), m_url(url) {}
+    : ContextLifecycleObserver(executionContext), m_url(url) {}
 
 }  // namespace blink