Replace DOMWindowProperty in Navigator supplements with ContextClient

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/DocumentUserGestureToken.h"
@@ skipping 72 matching lines @@
 }
 
 Document* NavigatorVR::document() {
   return frame() ? frame()->document() : 0;
 }
 
 DEFINE_TRACE(NavigatorVR) {
   visitor->trace(m_controller);
 
   Supplement<Navigator>::trace(visitor);
-  DOMWindowProperty::trace(visitor);
+  ContextClient::trace(visitor);
   PageVisibilityObserver::trace(visitor);
 }
 
 NavigatorVR::NavigatorVR(LocalFrame* frame)
-    : DOMWindowProperty(frame), PageVisibilityObserver(frame->page()) {
+    : ContextClient(frame), PageVisibilityObserver(frame->page()) {
   frame->domWindow()->registerEventListenerObserver(this);
 }
 
 NavigatorVR::~NavigatorVR() {}
 
 const char* NavigatorVR::supplementName() {
   return "NavigatorVR";
 }
 
 void NavigatorVR::enqueueVREvent(VRDisplayEvent* event) {
@@ skipping 44 matching lines @@
 }
 
 void NavigatorVR::didRemoveAllEventListeners(LocalDOMWindow* window) {
   if (m_controller) {
     m_controller->setListeningForActivate(false);
     m_listeningForActivate = false;
   }
 }
 
 }  // namespace blink