Replace DOMWindowProperty in DOMWindow's supplements with ContextClient

third_party/WebKit/Source/modules/storage/DOMWindowStorage.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/storage/DOMWindowStorage.h"
 
 #include "core/dom/Document.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/LocalDOMWindow.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
 #include "core/page/Page.h"
 #include "modules/storage/Storage.h"
 #include "modules/storage/StorageNamespace.h"
 #include "modules/storage/StorageNamespaceController.h"
 #include "wtf/PassRefPtr.h"
 
 namespace blink {
 
 DOMWindowStorage::DOMWindowStorage(LocalDOMWindow& window)
-    : DOMWindowProperty(window.frame()), m_window(&window) {}
+    : ContextClient(window.frame()), m_window(&window) {}
 
 DEFINE_TRACE(DOMWindowStorage) {
   visitor->trace(m_window);
   visitor->trace(m_sessionStorage);
   visitor->trace(m_localStorage);
   Supplement<LocalDOMWindow>::trace(visitor);
-  DOMWindowProperty::trace(visitor);
+  ContextClient::trace(visitor);
 }
 
 // static
 const char* DOMWindowStorage::supplementName() {
   return "DOMWindowStorage";
 }
 
 // static
 DOMWindowStorage& DOMWindowStorage::from(LocalDOMWindow& window) {
   DOMWindowStorage* supplement = static_cast<DOMWindowStorage*>(
@@ skipping 96 matching lines @@
       StorageNamespace::localStorageArea(document->getSecurityOrigin());
   if (!storageArea->canAccessStorage(m_window->frame())) {
     exceptionState.throwSecurityError(accessDeniedMessage);
     return nullptr;
   }
   m_localStorage = Storage::create(m_window->frame(), storageArea);
   return m_localStorage;
 }
 
 }  // namespace blink