Upstream version 10.39.225.0

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

diff --git a/src/android_webview/native/aw_quota_manager_bridge_impl.h b/src/android_webview/native/aw_quota_manager_bridge_impl.h
index c0158ed..b327df1 100644 (file)
--- a/src/android_webview/native/aw_quota_manager_bridge_impl.h
+++ b/src/android_webview/native/aw_quota_manager_bridge_impl.h
@@ -10,7 +10,7 @@
 #include <vector>
 
 #include "android_webview/browser/aw_quota_manager_bridge.h"
-#include "base/android/jni_helper.h"
+#include "base/android/jni_weak_ref.h"
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
@@ -23,9 +23,9 @@ namespace content {
 class StoragePartition;
 }
 
-namespace quota {
+namespace storage {
 class QuotaManager;
-}  // namespace quota
+}  // namespace storage
 
 namespace android_webview {
 
@@ -60,7 +60,7 @@ class AwQuotaManagerBridgeImpl : public AwQuotaManagerBridge {
 
   content::StoragePartition* GetStoragePartition() const;
 
-  quota::QuotaManager* GetQuotaManager() const;
+  storage::QuotaManager* GetQuotaManager() const;
 
   void DeleteAllDataOnUiThread();
   void DeleteOriginOnUiThread(const base::string16& origin);
@@ -77,10 +77,11 @@ class AwQuotaManagerBridgeImpl : public AwQuotaManagerBridge {
   void QuotaUsageCallbackImpl(
       int jcallback_id, bool is_quota, int64 usage, int64 quota);
 
-  base::WeakPtrFactory<AwQuotaManagerBridgeImpl> weak_factory_;
   AwBrowserContext* browser_context_;
   JavaObjectWeakGlobalRef java_ref_;
 
+  base::WeakPtrFactory<AwQuotaManagerBridgeImpl> weak_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(AwQuotaManagerBridgeImpl);
 };