Remove ContextClient from NavigatorStorageQuota

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

Index: third_party/WebKit/Source/modules/quota/NavigatorStorageQuota.cpp
diff --git a/third_party/WebKit/Source/modules/quota/NavigatorStorageQuota.cpp b/third_party/WebKit/Source/modules/quota/NavigatorStorageQuota.cpp
index 77f5b5a46875ddd467ec0621bb12b6a1c818e7d7..4c7021355416db88c9025e2eb9c43d9469250f82 100644
--- a/third_party/WebKit/Source/modules/quota/NavigatorStorageQuota.cpp
+++ b/third_party/WebKit/Source/modules/quota/NavigatorStorageQuota.cpp
@@ -37,8 +37,8 @@
 
 namespace blink {
 
-NavigatorStorageQuota::NavigatorStorageQuota(LocalFrame* frame)
-    : ContextClient(frame) {}
+NavigatorStorageQuota::NavigatorStorageQuota(Navigator& navigator)
+    : Supplement<Navigator>(navigator) {}
 
 const char* NavigatorStorageQuota::supplementName() {
   return "NavigatorStorageQuota";
@@ -48,7 +48,7 @@ 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;
@@ -73,27 +73,27 @@ StorageManager* NavigatorStorageQuota::storage(Navigator& navigator) {
 }
 
 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();
 }
@@ -104,7 +104,6 @@ DEFINE_TRACE(NavigatorStorageQuota) {
   visitor->trace(m_persistentStorage);
   visitor->trace(m_storageManager);
   Supplement<Navigator>::trace(visitor);
-  ContextClient::trace(visitor);
 }
 
 }  // namespace blink