Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / android_webview / native / aw_quota_manager_bridge_impl.cc

diff --git a/src/android_webview/native/aw_quota_manager_bridge_impl.cc b/src/android_webview/native/aw_quota_manager_bridge_impl.cc
index 51a25a0..9ec1b6b 100644 (file)
--- a/src/android_webview/native/aw_quota_manager_bridge_impl.cc
+++ b/src/android_webview/native/aw_quota_manager_bridge_impl.cc
@@ -15,15 +15,15 @@
 #include "content/public/browser/storage_partition.h"
 #include "content/public/common/content_client.h"
 #include "jni/AwQuotaManagerBridge_jni.h"
+#include "storage/browser/quota/quota_manager.h"
+#include "storage/common/quota/quota_types.h"
 #include "url/gurl.h"
-#include "webkit/browser/quota/quota_manager.h"
-#include "webkit/common/quota/quota_types.h"
 
 using base::android::AttachCurrentThread;
 using content::BrowserThread;
 using content::StoragePartition;
-using quota::QuotaClient;
-using quota::QuotaManager;
+using storage::QuotaClient;
+using storage::QuotaManager;
 
 namespace android_webview {
 
@@ -46,10 +46,10 @@ class GetOriginsTask : public base::RefCountedThreadSafe<GetOriginsTask> {
   ~GetOriginsTask();
 
   void OnOriginsObtained(const std::set<GURL>& origins,
-                         quota::StorageType type);
+                         storage::StorageType type);
 
   void OnUsageAndQuotaObtained(const GURL& origin,
-                               quota::QuotaStatusCode status_code,
+                               storage::QuotaStatusCode status_code,
                                int64 usage,
                                int64 quota);
 
@@ -86,13 +86,13 @@ void GetOriginsTask::Run() {
       FROM_HERE,
       base::Bind(&QuotaManager::GetOriginsModifiedSince,
                  quota_manager_,
-                 quota::kStorageTypeTemporary,
-                 base::Time()  /* Since beginning of time. */,
+                 storage::kStorageTypeTemporary,
+                 base::Time() /* Since beginning of time. */,
                  base::Bind(&GetOriginsTask::OnOriginsObtained, this)));
 }
 
-void GetOriginsTask::OnOriginsObtained(
-    const std::set<GURL>& origins, quota::StorageType type) {
+void GetOriginsTask::OnOriginsObtained(const std::set<GURL>& origins,
+                                       storage::StorageType type) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   num_callbacks_to_wait_ = origins.size();
   num_callbacks_received_ = 0u;
@@ -109,12 +109,13 @@ void GetOriginsTask::OnOriginsObtained(
   CheckDone();
 }
 
-void GetOriginsTask::OnUsageAndQuotaObtained(const GURL& origin,
-                                             quota::QuotaStatusCode status_code,
-                                             int64 usage,
-                                             int64 quota) {
+void GetOriginsTask::OnUsageAndQuotaObtained(
+    const GURL& origin,
+    storage::QuotaStatusCode status_code,
+    int64 usage,
+    int64 quota) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  if (status_code == quota::kQuotaStatusOk) {
+  if (status_code == storage::kQuotaStatusOk) {
     origin_.push_back(origin.spec());
     usage_.push_back(usage);
     quota_.push_back(quota);
@@ -172,8 +173,8 @@ scoped_refptr<AwQuotaManagerBridge> AwQuotaManagerBridgeImpl::Create(
 
 AwQuotaManagerBridgeImpl::AwQuotaManagerBridgeImpl(
     AwBrowserContext* browser_context)
-    : weak_factory_(this),
-      browser_context_(browser_context) {
+    : browser_context_(browser_context),
+      weak_factory_(this) {
 }
 
 AwQuotaManagerBridgeImpl::~AwQuotaManagerBridgeImpl() {}
@@ -286,11 +287,11 @@ namespace {
 
 void OnUsageAndQuotaObtained(
     const AwQuotaManagerBridgeImpl::QuotaUsageCallback& ui_callback,
-    quota::QuotaStatusCode status_code,
+    storage::QuotaStatusCode status_code,
     int64 usage,
     int64 quota) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  if (status_code != quota::kQuotaStatusOk) {
+  if (status_code != storage::kQuotaStatusOk) {
     usage = 0;
     quota = 0;
   }
@@ -334,7 +335,7 @@ void AwQuotaManagerBridgeImpl::GetUsageAndQuotaForOriginOnUiThread(
       base::Bind(&QuotaManager::GetUsageAndQuota,
                  GetQuotaManager(),
                  GURL(origin),
-                 quota::kStorageTypeTemporary,
+                 storage::kStorageTypeTemporary,
                  base::Bind(&OnUsageAndQuotaObtained, ui_callback)));
 }