Switch to standard integer types in content/.

content/child/indexed_db/webidbcursor_impl_unittest.cc

 // Copyright 2013 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 <stddef.h>
+#include <stdint.h>
+
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/values.h"
 #include "content/child/indexed_db/indexed_db_dispatcher.h"
 #include "content/child/indexed_db/indexed_db_key_builders.h"
 #include "content/child/indexed_db/mock_webidbcallbacks.h"
 #include "content/child/indexed_db/webidbcursor_impl.h"
 #include "content/child/thread_safe_sender.h"
 #include "content/common/indexed_db/indexed_db_key.h"
 #include "ipc/ipc_sync_message_filter.h"
@@ skipping 20 matching lines @@
         prefetch_calls_(0),
         last_prefetch_count_(0),
         reset_calls_(0),
         last_used_count_(0),
         advance_calls_(0),
         continue_calls_(0),
         destroyed_cursor_id_(0) {}
 
   void RequestIDBCursorPrefetch(int n,
                                 WebIDBCallbacks* callbacks,
-                                int32 ipc_cursor_id) override {
+                                int32_t ipc_cursor_id) override {
     ++prefetch_calls_;
     last_prefetch_count_ = n;
     callbacks_.reset(callbacks);
   }
 
   void RequestIDBCursorPrefetchReset(int used_prefetches,
                                      int unused_prefetches,
-                                     int32 ipc_cursor_id) override {
+                                     int32_t ipc_cursor_id) override {
     ++reset_calls_;
     last_used_count_ = used_prefetches;
   }
 
   void RequestIDBCursorAdvance(unsigned long count,
                                WebIDBCallbacks* callbacks,
-                               int32 ipc_cursor_id,
-                               int64 transaction_id) override {
+                               int32_t ipc_cursor_id,
+                               int64_t transaction_id) override {
     ++advance_calls_;
     callbacks_.reset(callbacks);
   }
 
   void RequestIDBCursorContinue(const IndexedDBKey& key,
                                 const IndexedDBKey& primary_key,
                                 WebIDBCallbacks* callbacks,
-                                int32 ipc_cursor_id,
-                                int64 transaction_id) override {
+                                int32_t ipc_cursor_id,
+                                int64_t transaction_id) override {
     ++continue_calls_;
     callbacks_.reset(callbacks);
   }
 
-  void CursorDestroyed(int32 ipc_cursor_id) override {
+  void CursorDestroyed(int32_t ipc_cursor_id) override {
     destroyed_cursor_id_ = ipc_cursor_id;
   }
 
   int prefetch_calls() { return prefetch_calls_; }
   int last_prefetch_count() { return last_prefetch_count_; }
   int reset_calls() { return reset_calls_; }
   int last_used_count() { return last_used_count_; }
   int advance_calls() { return advance_calls_; }
   int continue_calls() { return continue_calls_; }
-  int32 destroyed_cursor_id() { return destroyed_cursor_id_; }
+  int32_t destroyed_cursor_id() { return destroyed_cursor_id_; }
 
  private:
   int prefetch_calls_;
   int last_prefetch_count_;
   int reset_calls_;
   int last_used_count_;
   int advance_calls_;
   int continue_calls_;
-  int32 destroyed_cursor_id_;
+  int32_t destroyed_cursor_id_;
   scoped_ptr<WebIDBCallbacks> callbacks_;
 };
 
 class MockContinueCallbacks : public StrictMock<MockWebIDBCallbacks> {
  public:
   MockContinueCallbacks(IndexedDBKey* key = 0,
                         WebVector<WebBlobInfo>* webBlobInfo = 0)
       : key_(key), web_blob_info_(webBlobInfo) {}
 
   void onSuccess(const WebIDBKey& key,
@@ skipping 35 matching lines @@
   base::MessageLoop message_loop_;
   WebIDBKey null_key_;
   scoped_refptr<ThreadSafeSender> thread_safe_sender_;
   scoped_ptr<MockDispatcher> dispatcher_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(WebIDBCursorImplTest);
 };
 
 TEST_F(WebIDBCursorImplTest, PrefetchTest) {
-  const int64 transaction_id = 1;
+  const int64_t transaction_id = 1;
   {
     WebIDBCursorImpl cursor(WebIDBCursorImpl::kInvalidCursorId,
                             transaction_id,
                             thread_safe_sender_.get());
 
     // Call continue() until prefetching should kick in.
     int continue_calls = 0;
     EXPECT_EQ(dispatcher_->continue_calls(), 0);
     for (int i = 0; i < WebIDBCursorImpl::kPrefetchContinueThreshold; ++i) {
       cursor.continueFunction(null_key_, new MockContinueCallbacks());
@@ skipping 48 matching lines @@
         EXPECT_EQ(expected_key++, key.number());
       }
     }
   }
 
   EXPECT_EQ(dispatcher_->destroyed_cursor_id(),
             WebIDBCursorImpl::kInvalidCursorId);
 }
 
 TEST_F(WebIDBCursorImplTest, AdvancePrefetchTest) {
-  const int64 transaction_id = 1;
+  const int64_t transaction_id = 1;
   WebIDBCursorImpl cursor(WebIDBCursorImpl::kInvalidCursorId,
                           transaction_id,
                           thread_safe_sender_.get());
 
   // Call continue() until prefetching should kick in.
   EXPECT_EQ(0, dispatcher_->continue_calls());
   for (int i = 0; i < WebIDBCursorImpl::kPrefetchContinueThreshold; ++i) {
     cursor.continueFunction(null_key_, new MockContinueCallbacks());
   }
   EXPECT_EQ(0, dispatcher_->prefetch_calls());
@@ skipping 49 matching lines @@
   // IDBCursor.advance(lots) - beyond the fetched amount
   cursor.advance(WebIDBCursorImpl::kMaxPrefetchAmount,
                  new MockContinueCallbacks(&key));
   EXPECT_EQ(1, dispatcher_->advance_calls());
   EXPECT_EQ(1, dispatcher_->prefetch_calls());
   EXPECT_EQ(static_cast<int>(WebIDBCursorImpl::kPrefetchContinueThreshold),
             dispatcher_->continue_calls());
 }
 
 TEST_F(WebIDBCursorImplTest, PrefetchReset) {
-  const int64 transaction_id = 1;
+  const int64_t transaction_id = 1;
   WebIDBCursorImpl cursor(WebIDBCursorImpl::kInvalidCursorId,
                           transaction_id,
                           thread_safe_sender_.get());
 
   // Call continue() until prefetching should kick in.
   int continue_calls = 0;
   EXPECT_EQ(dispatcher_->continue_calls(), 0);
   for (int i = 0; i < WebIDBCursorImpl::kPrefetchContinueThreshold; ++i) {
     cursor.continueFunction(null_key_, new MockContinueCallbacks());
     EXPECT_EQ(++continue_calls, dispatcher_->continue_calls());
@@ skipping 25 matching lines @@
   // The real dispatcher would call cursor->CachedContinue(), so do that:
   MockContinueCallbacks callbacks;
   cursor.CachedContinue(&callbacks);
 
   // Now the cursor should have reset the rest of the cache.
   EXPECT_EQ(1, dispatcher_->reset_calls());
   EXPECT_EQ(1, dispatcher_->last_used_count());
 }
 
 }  // namespace content