Make use of ContextClient in modules/speech/

third_party/WebKit/Source/modules/speech/SpeechSynthesisUtterance.h

 /*
  * 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
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef SpeechSynthesisUtterance_h
 #define SpeechSynthesisUtterance_h
 
+#include "core/dom/ContextLifecycleObserver.h"
 #include "modules/EventTargetModules.h"
 #include "modules/speech/SpeechSynthesisVoice.h"
 #include "platform/heap/Handle.h"
 #include "platform/speech/PlatformSpeechSynthesisUtterance.h"
 
 namespace blink {
 
 class SpeechSynthesisUtterance final
     : public EventTargetWithInlineData,
+      public ContextClient,
       public PlatformSpeechSynthesisUtteranceClient {
   DEFINE_WRAPPERTYPEINFO();
   USING_GARBAGE_COLLECTED_MIXIN(SpeechSynthesisUtterance);
 
  public:
   static SpeechSynthesisUtterance* create(ExecutionContext*, const String&);
 
   ~SpeechSynthesisUtterance() override;
 
   const String& text() const { return m_platformUtterance->text(); }
@@ skipping 20 matching lines @@
   }
 
   DEFINE_ATTRIBUTE_EVENT_LISTENER(start);
   DEFINE_ATTRIBUTE_EVENT_LISTENER(end);
   DEFINE_ATTRIBUTE_EVENT_LISTENER(error);
   DEFINE_ATTRIBUTE_EVENT_LISTENER(pause);
   DEFINE_ATTRIBUTE_EVENT_LISTENER(resume);
   DEFINE_ATTRIBUTE_EVENT_LISTENER(mark);
   DEFINE_ATTRIBUTE_EVENT_LISTENER(boundary);
 
-  ExecutionContext* getExecutionContext() const override;
+  ExecutionContext* getExecutionContext() const override {
+    return ContextClient::getExecutionContext();
+  }
 
   PlatformSpeechSynthesisUtterance* platformUtterance() const {
     return m_platformUtterance;
   }
 
   DECLARE_VIRTUAL_TRACE();
 
  private:
   SpeechSynthesisUtterance(ExecutionContext*, const String&);
 
   // EventTarget
   const AtomicString& interfaceName() const override;
 
-  Member<ExecutionContext> m_executionContext;
   Member<PlatformSpeechSynthesisUtterance> m_platformUtterance;
   Member<SpeechSynthesisVoice> m_voice;
 };
 
 }  // namespace blink
 
 #endif  // SpeechSynthesisUtterance_h