Remove ContextClient from NavigatorStorageQuota

third_party/WebKit/Source/modules/quota/NavigatorStorageQuota.cpp

 /*
  * Copyright (C) 2013 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 19 matching lines @@
 
 #include "modules/quota/NavigatorStorageQuota.h"
 
 #include "core/frame/Navigator.h"
 #include "modules/quota/DeprecatedStorageQuota.h"
 #include "modules/quota/StorageManager.h"
 #include "modules/quota/StorageQuota.h"
 
 namespace blink {
 
-NavigatorStorageQuota::NavigatorStorageQuota(LocalFrame* frame)
-    : ContextClient(frame) {}
+NavigatorStorageQuota::NavigatorStorageQuota(Navigator& navigator)
+    : Supplement<Navigator>(navigator) {}
 
 const char* NavigatorStorageQuota::supplementName() {
   return "NavigatorStorageQuota";
 }
 
 NavigatorStorageQuota& NavigatorStorageQuota::from(Navigator& navigator) {
   NavigatorStorageQuota* supplement = static_cast<NavigatorStorageQuota*>(
       Supplement<Navigator>::from(navigator, supplementName()));
   if (!supplement) {
-    supplement = new NavigatorStorageQuota(navigator.frame());
+    supplement = new NavigatorStorageQuota(navigator);
     provideTo(navigator, supplementName(), supplement);
   }
   return *supplement;
 }
 
 StorageQuota* NavigatorStorageQuota::storageQuota(Navigator& navigator) {
   return NavigatorStorageQuota::from(navigator).storageQuota();
 }
 
 DeprecatedStorageQuota* NavigatorStorageQuota::webkitTemporaryStorage(
     Navigator& navigator) {
   return NavigatorStorageQuota::from(navigator).webkitTemporaryStorage();
 }
 
 DeprecatedStorageQuota* NavigatorStorageQuota::webkitPersistentStorage(
     Navigator& navigator) {
   return NavigatorStorageQuota::from(navigator).webkitPersistentStorage();
 }
 
 StorageManager* NavigatorStorageQuota::storage(Navigator& navigator) {
   return NavigatorStorageQuota::from(navigator).storage();
 }
 
 StorageQuota* NavigatorStorageQuota::storageQuota() const {
-  if (!m_storageQuota && frame())

[haraken, 2017/01/06 01:20:37]

These frame() checks won't really make sense, so dropped.

[sof, 2017/01/06 07:22:54]

Looks fine. Digging around in history, it seems like one of the earliest of
these conditional-creation methods used to access frame() upon lazily creating
to emit a console message..which was subsequently dropped. But the consistency
of checking frame() before creating remained & used when extending this
interface.

+  if (!m_storageQuota)
     m_storageQuota = StorageQuota::create();
   return m_storageQuota.get();
 }
 
 DeprecatedStorageQuota* NavigatorStorageQuota::webkitTemporaryStorage() const {
-  if (!m_temporaryStorage && frame())
+  if (!m_temporaryStorage)
     m_temporaryStorage =
         DeprecatedStorageQuota::create(DeprecatedStorageQuota::Temporary);
   return m_temporaryStorage.get();
 }
 
 DeprecatedStorageQuota* NavigatorStorageQuota::webkitPersistentStorage() const {
-  if (!m_persistentStorage && frame())
+  if (!m_persistentStorage)
     m_persistentStorage =
         DeprecatedStorageQuota::create(DeprecatedStorageQuota::Persistent);
   return m_persistentStorage.get();
 }
 
 StorageManager* NavigatorStorageQuota::storage() const {
-  if (!m_storageManager && frame())
+  if (!m_storageManager)
     m_storageManager = new StorageManager();
   return m_storageManager.get();
 }
 
 DEFINE_TRACE(NavigatorStorageQuota) {
   visitor->trace(m_storageQuota);
   visitor->trace(m_temporaryStorage);
   visitor->trace(m_persistentStorage);
   visitor->trace(m_storageManager);
   Supplement<Navigator>::trace(visitor);
-  ContextClient::trace(visitor);
 }
 
 }  // namespace blink