Remove ContextClient from NavigatorStorageQuota

Now that Navigator's supplement can get a Navigator object via host().
Then Navigator's supplement doesn't need to observe ContextClient.

BUG=610176

Review-Url: https://codereview.chromium.org/2617583005
Cr-Commit-Position: refs/heads/master@{#441898}

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())
+  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

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

@@ -31,7 +31,6 @@
 #ifndef NavigatorStorageQuota_h
 #define NavigatorStorageQuota_h
 
-#include "core/dom/ContextLifecycleObserver.h"
 #include "core/frame/Navigator.h"
 #include "modules/quota/DeprecatedStorageQuota.h"
 #include "platform/Supplementable.h"
@@ -39,15 +38,13 @@
 
 namespace blink {
 
-class LocalFrame;
 class Navigator;
 class StorageManager;
 class StorageQuota;
 
 class NavigatorStorageQuota final
     : public GarbageCollected<NavigatorStorageQuota>,
-      public Supplement<Navigator>,
-      public ContextClient {
+      public Supplement<Navigator> {
   USING_GARBAGE_COLLECTED_MIXIN(NavigatorStorageQuota);
 
  public:
@@ -65,7 +62,7 @@ class NavigatorStorageQuota final
   DECLARE_TRACE();
 
  private:
-  explicit NavigatorStorageQuota(LocalFrame*);
+  explicit NavigatorStorageQuota(Navigator&);
   static const char* supplementName();
 
   mutable Member<StorageQuota> m_storageQuota;