Use Platform::queryUsageAndQuota and deprecate WebFrameClient::queryUsageAndQuota

Source/modules/quota/WebStorageQuotaCallbacksImpl.h

 /*
  * Copyright (C) 2011 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 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef WebStorageQuotaCallbacksImpl_h
 #define WebStorageQuotaCallbacksImpl_h
 
-#include "WebStorageQuotaCallbacks.h"
-#include "wtf/PassOwnPtr.h"
+#include "modules/quota/StorageErrorCallback.h"
+#include "modules/quota/StorageQuotaCallback.h"
+#include "modules/quota/StorageUsageCallback.h"
+#include "public/platform/WebStorageQuotaCallbacks.h"
+#include "wtf/OwnPtr.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefPtr.h"
 
 namespace WebCore {
-class StorageErrorCallback;
-class StorageQuotaCallback;
-class StorageUsageCallback;
-}
 
-namespace WebKit {
+class WebStorageQuotaCallbacksImpl : public WebKit::WebStorageQuotaCallbacks {
+public:
+    // The class is self-destructed and thus we have leakedPtr constructors.
+    static WebStorageQuotaCallbacksImpl* createLeakedPtr(PassRefPtr<StorageUsageCallback> success, PassRefPtr<StorageErrorCallback> error)
+    {
+        OwnPtr<WebStorageQuotaCallbacksImpl> callbacks = adoptPtr(new WebStorageQuotaCallbacksImpl(success, error));
+        return callbacks.leakPtr();
+    }
 
-class WebStorageQuotaCallbacksImpl : public WebStorageQuotaCallbacks {
-public:
-    // The class is self-destructed and thus we have bare constructors.
-    WebStorageQuotaCallbacksImpl(PassRefPtr<WebCore::StorageUsageCallback>, PassRefPtr<WebCore::StorageErrorCallback>);
-    WebStorageQuotaCallbacksImpl(PassRefPtr<WebCore::StorageQuotaCallback>, PassRefPtr<WebCore::StorageErrorCallback>);
+    static WebStorageQuotaCallbacksImpl* createLeakedPtr(PassRefPtr<StorageQuotaCallback> success, PassRefPtr<StorageErrorCallback> error)
+    {
+        OwnPtr<WebStorageQuotaCallbacksImpl> callbacks = adoptPtr(new WebStorageQuotaCallbacksImpl(success, error));
+        return callbacks.leakPtr();
+    }
 
     virtual ~WebStorageQuotaCallbacksImpl();
 
     virtual void didQueryStorageUsageAndQuota(unsigned long long usageInBytes, unsigned long long quotaInBytes);
     virtual void didGrantStorageQuota(unsigned long long grantedQuotaInBytes);
-    virtual void didFail(WebStorageQuotaError);
+    virtual void didFail(WebKit::WebStorageQuotaError);
 
 private:
-    RefPtr<WebCore::StorageUsageCallback> m_usageCallback;
-    RefPtr<WebCore::StorageQuotaCallback> m_quotaCallback;
-    RefPtr<WebCore::StorageErrorCallback> m_errorCallback;
+    WebStorageQuotaCallbacksImpl(PassRefPtr<StorageUsageCallback>, PassRefPtr<StorageErrorCallback>);
+    WebStorageQuotaCallbacksImpl(PassRefPtr<StorageQuotaCallback>, PassRefPtr<StorageErrorCallback>);
+
+    RefPtr<StorageUsageCallback> m_usageCallback;
+    RefPtr<StorageQuotaCallback> m_quotaCallback;
+    RefPtr<StorageErrorCallback> m_errorCallback;
 };
 
-} // namespace WebKit
+} // namespace
 
 #endif // WebStorageQuotaCallbacksImpl_h