Collapse fileapi, webkit_blob, webkit_database, quota, and webkit_common namespaces into single sto…

content/child/quota_dispatcher.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/child/quota_dispatcher.h"
 
 #include "base/basictypes.h"
 #include "base/lazy_instance.h"
 #include "base/threading/thread_local.h"
 #include "content/child/child_thread.h"
 #include "content/child/quota_message_filter.h"
 #include "content/child/thread_safe_sender.h"
 #include "content/common/quota_messages.h"
 #include "third_party/WebKit/public/platform/WebStorageQuotaCallbacks.h"
 #include "third_party/WebKit/public/platform/WebStorageQuotaType.h"
 #include "third_party/WebKit/public/web/WebUserGestureIndicator.h"
 #include "url/gurl.h"
 
 using blink::WebStorageQuotaCallbacks;
 using blink::WebStorageQuotaError;
 using blink::WebStorageQuotaType;
-using quota::QuotaStatusCode;
-using quota::StorageType;
+using storage::QuotaStatusCode;
+using storage::StorageType;
 
 namespace content {
 
 static base::LazyInstance<base::ThreadLocalPointer<QuotaDispatcher> >::Leaky
     g_quota_dispatcher_tls = LAZY_INSTANCE_INITIALIZER;
 
 namespace {
 
 // QuotaDispatcher::Callback implementation for WebStorageQuotaCallbacks.
 class WebStorageQuotaDispatcherCallback : public QuotaDispatcher::Callback {
  public:
   explicit WebStorageQuotaDispatcherCallback(
       blink::WebStorageQuotaCallbacks callback)
       : callbacks_(callback) {}
   virtual ~WebStorageQuotaDispatcherCallback() {}
 
   virtual void DidQueryStorageUsageAndQuota(int64 usage, int64 quota) OVERRIDE {
     callbacks_.didQueryStorageUsageAndQuota(usage, quota);
   }
   virtual void DidGrantStorageQuota(int64 usage, int64 granted_quota) OVERRIDE {
     callbacks_.didGrantStorageQuota(usage, granted_quota);
   }
-  virtual void DidFail(quota::QuotaStatusCode error) OVERRIDE {
+  virtual void DidFail(storage::QuotaStatusCode error) OVERRIDE {
     callbacks_.didFail(static_cast<WebStorageQuotaError>(error));
   }
 
  private:
   blink::WebStorageQuotaCallbacks callbacks_;
 
   DISALLOW_COPY_AND_ASSIGN(WebStorageQuotaDispatcherCallback);
 };
 
 int CurrentWorkerId() {
   return WorkerTaskRunner::Instance()->CurrentWorkerId();
 }
 
 }  // namespace
 
 QuotaDispatcher::QuotaDispatcher(ThreadSafeSender* thread_safe_sender,
                                  QuotaMessageFilter* quota_message_filter)
     : thread_safe_sender_(thread_safe_sender),
       quota_message_filter_(quota_message_filter) {
   g_quota_dispatcher_tls.Pointer()->Set(this);
 }
 
 QuotaDispatcher::~QuotaDispatcher() {
   IDMap<Callback, IDMapOwnPointer>::iterator iter(&pending_quota_callbacks_);
   while (!iter.IsAtEnd()) {
-    iter.GetCurrentValue()->DidFail(quota::kQuotaErrorAbort);
+    iter.GetCurrentValue()->DidFail(storage::kQuotaErrorAbort);
     iter.Advance();
   }
 
   g_quota_dispatcher_tls.Pointer()->Set(NULL);
 }
 
 QuotaDispatcher* QuotaDispatcher::ThreadSpecificInstance(
     ThreadSafeSender* thread_safe_sender,
     QuotaMessageFilter* quota_message_filter) {
   if (g_quota_dispatcher_tls.Pointer()->Get())
@@ skipping 85 matching lines @@
 
 void QuotaDispatcher::DidFail(
     int request_id,
     QuotaStatusCode error) {
   Callback* callback = pending_quota_callbacks_.Lookup(request_id);
   DCHECK(callback);
   callback->DidFail(error);
   pending_quota_callbacks_.Remove(request_id);
 }
 
-COMPILE_ASSERT(int(blink::WebStorageQuotaTypeTemporary) == \
-               int(quota::kStorageTypeTemporary), mismatching_enums);
-COMPILE_ASSERT(int(blink::WebStorageQuotaTypePersistent) == \
-               int(quota::kStorageTypePersistent), mismatching_enums);
+COMPILE_ASSERT(int(blink::WebStorageQuotaTypeTemporary) ==
+                   int(storage::kStorageTypeTemporary),
+               mismatching_enums);
+COMPILE_ASSERT(int(blink::WebStorageQuotaTypePersistent) ==
+                   int(storage::kStorageTypePersistent),
+               mismatching_enums);
 
-COMPILE_ASSERT(int(blink::WebStorageQuotaErrorNotSupported) == \
-               int(quota::kQuotaErrorNotSupported), mismatching_enums);
-COMPILE_ASSERT(int(blink::WebStorageQuotaErrorAbort) == \
-               int(quota::kQuotaErrorAbort), mismatching_enums);
+COMPILE_ASSERT(int(blink::WebStorageQuotaErrorNotSupported) ==
+                   int(storage::kQuotaErrorNotSupported),
+               mismatching_enums);
+COMPILE_ASSERT(int(blink::WebStorageQuotaErrorAbort) ==
+                   int(storage::kQuotaErrorAbort),
+               mismatching_enums);
 
 }  // namespace content