Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / content / child / quota_dispatcher.cc

diff --git a/src/content/child/quota_dispatcher.cc b/src/content/child/quota_dispatcher.cc
index be304c2..ff762ed 100644 (file)
--- a/src/content/child/quota_dispatcher.cc
+++ b/src/content/child/quota_dispatcher.cc
@@ -34,24 +34,25 @@ namespace {
 // QuotaDispatcher::Callback implementation for WebStorageQuotaCallbacks.
 class WebStorageQuotaDispatcherCallback : public QuotaDispatcher::Callback {
  public:
-  WebStorageQuotaDispatcherCallback(blink::WebStorageQuotaCallbacks* callback)
-      : callbacks_(callback) {
-    DCHECK(callbacks_);
-  }
+  explicit WebStorageQuotaDispatcherCallback(
+      blink::WebStorageQuotaCallbacks callback)
+      : callbacks_(callback) {}
   virtual ~WebStorageQuotaDispatcherCallback() {}
+
   virtual void DidQueryStorageUsageAndQuota(int64 usage, int64 quota) OVERRIDE {
-    callbacks_->didQueryStorageUsageAndQuota(usage, quota);
+    callbacks_.didQueryStorageUsageAndQuota(usage, quota);
   }
   virtual void DidGrantStorageQuota(int64 usage, int64 granted_quota) OVERRIDE {
-    callbacks_->didGrantStorageQuota(usage, granted_quota);
+    callbacks_.didGrantStorageQuota(usage, granted_quota);
   }
   virtual void DidFail(quota::QuotaStatusCode error) OVERRIDE {
-    callbacks_->didFail(static_cast<WebStorageQuotaError>(error));
+    callbacks_.didFail(static_cast<WebStorageQuotaError>(error));
   }
 
  private:
-  // Not owned (self-destructed).
-  blink::WebStorageQuotaCallbacks* callbacks_;
+  blink::WebStorageQuotaCallbacks callbacks_;
+
+  DISALLOW_COPY_AND_ASSIGN(WebStorageQuotaDispatcherCallback);
 };
 
 int CurrentWorkerId() {
@@ -122,7 +123,7 @@ void QuotaDispatcher::RequestStorageQuota(
     int render_view_id,
     const GURL& origin_url,
     StorageType type,
-    int64 requested_size,
+    uint64 requested_size,
     Callback* callback) {
   DCHECK(callback);
   DCHECK(CurrentWorkerId() == 0);
@@ -135,7 +136,7 @@ void QuotaDispatcher::RequestStorageQuota(
 // static
 QuotaDispatcher::Callback*
 QuotaDispatcher::CreateWebStorageQuotaCallbacksWrapper(
-    blink::WebStorageQuotaCallbacks* callbacks) {
+    blink::WebStorageQuotaCallbacks callbacks) {
   return new WebStorageQuotaDispatcherCallback(callbacks);
 }