Switch to standard integer types in content/.

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/macros.h"
 #include "base/threading/thread_local.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;
@@ skipping 10 matching lines @@
 namespace {
 
 // QuotaDispatcher::Callback implementation for WebStorageQuotaCallbacks.
 class WebStorageQuotaDispatcherCallback : public QuotaDispatcher::Callback {
  public:
   explicit WebStorageQuotaDispatcherCallback(
       blink::WebStorageQuotaCallbacks callback)
       : callbacks_(callback) {}
   ~WebStorageQuotaDispatcherCallback() override {}
 
-  void DidQueryStorageUsageAndQuota(int64 usage, int64 quota) override {
+  void DidQueryStorageUsageAndQuota(int64_t usage, int64_t quota) override {
     callbacks_.didQueryStorageUsageAndQuota(usage, quota);
   }
-  void DidGrantStorageQuota(int64 usage, int64 granted_quota) override {
+  void DidGrantStorageQuota(int64_t usage, int64_t granted_quota) override {
     callbacks_.didGrantStorageQuota(usage, granted_quota);
   }
   void DidFail(storage::QuotaStatusCode error) override {
     callbacks_.didFail(static_cast<WebStorageQuotaError>(error));
   }
 
  private:
   blink::WebStorageQuotaCallbacks callbacks_;
 
   DISALLOW_COPY_AND_ASSIGN(WebStorageQuotaDispatcherCallback);
@@ skipping 56 matching lines @@
     const GURL& origin_url,
     StorageType type,
     Callback* callback) {
   DCHECK(callback);
   int request_id = quota_message_filter_->GenerateRequestID(CurrentWorkerId());
   pending_quota_callbacks_.AddWithID(callback, request_id);
   thread_safe_sender_->Send(new QuotaHostMsg_QueryStorageUsageAndQuota(
       request_id, origin_url, type));
 }
 
-void QuotaDispatcher::RequestStorageQuota(
-    int render_view_id,
-    const GURL& origin_url,
-    StorageType type,
-    uint64 requested_size,
-    Callback* callback) {
+void QuotaDispatcher::RequestStorageQuota(int render_view_id,
+                                          const GURL& origin_url,
+                                          StorageType type,
+                                          uint64_t requested_size,
+                                          Callback* callback) {
   DCHECK(callback);
   DCHECK(CurrentWorkerId() == 0);
   int request_id = quota_message_filter_->GenerateRequestID(CurrentWorkerId());
   pending_quota_callbacks_.AddWithID(callback, request_id);
 
   StorageQuotaParams params;
   params.render_view_id = render_view_id;
   params.request_id = request_id;
   params.origin_url = origin_url;
   params.storage_type = type;
   params.requested_size = requested_size;
   params.user_gesture =
       blink::WebUserGestureIndicator::isProcessingUserGesture();
   thread_safe_sender_->Send(new QuotaHostMsg_RequestStorageQuota(params));
 }
 
 // static
 QuotaDispatcher::Callback*
 QuotaDispatcher::CreateWebStorageQuotaCallbacksWrapper(
     blink::WebStorageQuotaCallbacks callbacks) {
   return new WebStorageQuotaDispatcherCallback(callbacks);
 }
 
-void QuotaDispatcher::DidGrantStorageQuota(
-    int request_id,
-    int64 current_usage,
-    int64 granted_quota) {
+void QuotaDispatcher::DidGrantStorageQuota(int request_id,
+                                           int64_t current_usage,
+                                           int64_t granted_quota) {
   Callback* callback = pending_quota_callbacks_.Lookup(request_id);
   DCHECK(callback);
   callback->DidGrantStorageQuota(current_usage, granted_quota);
   pending_quota_callbacks_.Remove(request_id);
 }
 
-void QuotaDispatcher::DidQueryStorageUsageAndQuota(
-    int request_id,
-    int64 current_usage,
-    int64 current_quota) {
+void QuotaDispatcher::DidQueryStorageUsageAndQuota(int request_id,
+                                                   int64_t current_usage,
+                                                   int64_t current_quota) {
   Callback* callback = pending_quota_callbacks_.Lookup(request_id);
   DCHECK(callback);
   callback->DidQueryStorageUsageAndQuota(current_usage, current_quota);
   pending_quota_callbacks_.Remove(request_id);
 }
 
 void QuotaDispatcher::DidFail(
     int request_id,
     QuotaStatusCode error) {
   Callback* callback = pending_quota_callbacks_.Lookup(request_id);
@@ skipping 10 matching lines @@
               "mismatching enums: kStorageTypePersistent");
 
 static_assert(int(blink::WebStorageQuotaErrorNotSupported) ==
                   int(storage::kQuotaErrorNotSupported),
               "mismatching enums: kQuotaErrorNotSupported");
 static_assert(int(blink::WebStorageQuotaErrorAbort) ==
                   int(storage::kQuotaErrorAbort),
               "mismatching enums: kQuotaErrorAbort");
 
 }  // namespace content