1 files changed, 20 insertions, 17 deletions

diff --git a/chromium/third_party/WebKit/Source/modules/quota/WorkerNavigatorStorageQuota.cpp b/chromium/third_party/WebKit/Source/modules/quota/WorkerNavigatorStorageQuota.cpp
index d0522cbb111..c3f4dd923ca 100644
--- a/chromium/third_party/WebKit/Source/modules/quota/WorkerNavigatorStorageQuota.cpp
+++ b/chromium/third_party/WebKit/Source/modules/quota/WorkerNavigatorStorageQuota.cpp
@@ -31,7 +31,7 @@
 #include "config.h"
 #include "modules/quota/WorkerNavigatorStorageQuota.h"
 
-#include "modules/quota/StorageQuota.h"
+#include "modules/quota/DeprecatedStorageQuota.h"
 
 namespace WebCore {
 
@@ -39,47 +39,50 @@ WorkerNavigatorStorageQuota::WorkerNavigatorStorageQuota()
 {
 }
 
-WorkerNavigatorStorageQuota::~WorkerNavigatorStorageQuota()
-{
-}
-
 const char* WorkerNavigatorStorageQuota::supplementName()
 {
     return "WorkerNavigatorStorageQuota";
 }
 
-WorkerNavigatorStorageQuota* WorkerNavigatorStorageQuota::from(WorkerNavigator* navigator)
+WorkerNavigatorStorageQuota& WorkerNavigatorStorageQuota::from(WorkerNavigator& navigator)
 {
-    WorkerNavigatorStorageQuota* supplement = static_cast<WorkerNavigatorStorageQuota*>(Supplement<WorkerNavigator>::from(navigator, supplementName()));
+    WorkerNavigatorStorageQuota* supplement = static_cast<WorkerNavigatorStorageQuota*>(WillBeHeapSupplement<WorkerNavigator>::from(navigator, supplementName()));
     if (!supplement) {
         supplement = new WorkerNavigatorStorageQuota();
-        provideTo(navigator, supplementName(), adoptPtr(supplement));
+        provideTo(navigator, supplementName(), adoptPtrWillBeNoop(supplement));
     }
-    return supplement;
+    return *supplement;
 }
 
-StorageQuota* WorkerNavigatorStorageQuota::webkitTemporaryStorage(WorkerNavigator* navigator)
+DeprecatedStorageQuota* WorkerNavigatorStorageQuota::webkitTemporaryStorage(WorkerNavigator& navigator)
 {
-    return WorkerNavigatorStorageQuota::from(navigator)->webkitTemporaryStorage();
+    return WorkerNavigatorStorageQuota::from(navigator).webkitTemporaryStorage();
 }
 
-StorageQuota* WorkerNavigatorStorageQuota::webkitPersistentStorage(WorkerNavigator* navigator)
+DeprecatedStorageQuota* WorkerNavigatorStorageQuota::webkitPersistentStorage(WorkerNavigator& navigator)
 {
-    return WorkerNavigatorStorageQuota::from(navigator)->webkitPersistentStorage();
+    return WorkerNavigatorStorageQuota::from(navigator).webkitPersistentStorage();
 }
 
-StorageQuota* WorkerNavigatorStorageQuota::webkitTemporaryStorage() const
+DeprecatedStorageQuota* WorkerNavigatorStorageQuota::webkitTemporaryStorage() const
 {
     if (!m_temporaryStorage)
-        m_temporaryStorage = StorageQuota::create(StorageQuota::Temporary);
+        m_temporaryStorage = DeprecatedStorageQuota::create(DeprecatedStorageQuota::Temporary);
     return m_temporaryStorage.get();
 }
 
-StorageQuota* WorkerNavigatorStorageQuota::webkitPersistentStorage() const
+DeprecatedStorageQuota* WorkerNavigatorStorageQuota::webkitPersistentStorage() const
 {
     if (!m_persistentStorage)
-        m_persistentStorage = StorageQuota::create(StorageQuota::Persistent);
+        m_persistentStorage = DeprecatedStorageQuota::create(DeprecatedStorageQuota::Persistent);
     return m_persistentStorage.get();
 }
 
+void WorkerNavigatorStorageQuota::trace(Visitor* visitor)
+{
+    visitor->trace(m_temporaryStorage);
+    visitor->trace(m_persistentStorage);
+    WillBeHeapSupplement<WorkerNavigator>::trace(visitor);
+}
+
 } // namespace WebCore