Switch to standard integer types in content/browser/.

content/browser/indexed_db/indexed_db_transaction.h

 // Copyright (c) 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.
 
 #ifndef CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_TRANSACTION_H_
 #define CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_TRANSACTION_H_
 
+#include <stdint.h>
+
 #include <queue>
 #include <set>
 #include <stack>
 
-#include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "content/browser/indexed_db/indexed_db_backing_store.h"
 #include "content/browser/indexed_db/indexed_db_database.h"
 #include "content/browser/indexed_db/indexed_db_database_error.h"
 #include "third_party/WebKit/public/platform/modules/indexeddb/WebIDBTypes.h"
 
 namespace content {
@@ skipping 16 matching lines @@
   };
 
   virtual void Abort();
   leveldb::Status Commit();
   void Abort(const IndexedDBDatabaseError& error);
 
   // Called by the transaction coordinator when this transaction is unblocked.
   void Start();
 
   blink::WebIDBTransactionMode mode() const { return mode_; }
-  const std::set<int64>& scope() const { return object_store_ids_; }
+  const std::set<int64_t>& scope() const { return object_store_ids_; }
 
   void ScheduleTask(Operation task) {
     ScheduleTask(blink::WebIDBTaskTypeNormal, task);
   }
   void ScheduleTask(blink::WebIDBTaskType, Operation task);
   void ScheduleAbortTask(Operation abort_task);
   void RegisterOpenCursor(IndexedDBCursor* cursor);
   void UnregisterOpenCursor(IndexedDBCursor* cursor);
   void AddPreemptiveEvent() { pending_preemptive_events_++; }
   void DidCompletePreemptiveEvent() {
     pending_preemptive_events_--;
     DCHECK_GE(pending_preemptive_events_, 0);
   }
   IndexedDBBackingStore::Transaction* BackingStoreTransaction() {
     return transaction_.get();
   }
-  int64 id() const { return id_; }
+  int64_t id() const { return id_; }
 
   IndexedDBDatabase* database() const { return database_.get(); }
   IndexedDBDatabaseCallbacks* connection() const { return callbacks_.get(); }
 
   State state() const { return state_; }
   bool IsTimeoutTimerRunning() const { return timeout_timer_.IsRunning(); }
 
   struct Diagnostics {
     base::Time creation_time;
     base::Time start_time;
     int tasks_scheduled;
     int tasks_completed;
   };
 
   const Diagnostics& diagnostics() const { return diagnostics_; }
 
  protected:
   // Test classes may derive, but most creation should be done via
   // IndexedDBClassFactory.
   IndexedDBTransaction(
-      int64 id,
+      int64_t id,
       scoped_refptr<IndexedDBDatabaseCallbacks> callbacks,
-      const std::set<int64>& object_store_ids,
+      const std::set<int64_t>& object_store_ids,
       blink::WebIDBTransactionMode mode,
       IndexedDBDatabase* db,
       IndexedDBBackingStore::Transaction* backing_store_transaction);
   virtual ~IndexedDBTransaction();
 
   // May be overridden in tests.
   virtual base::TimeDelta GetInactivityTimeout() const;
 
  private:
   friend class BlobWriteCallbackImpl;
@@ skipping 13 matching lines @@
 
   bool IsTaskQueueEmpty() const;
   bool HasPendingTasks() const;
 
   void BlobWriteComplete(bool success);
   void ProcessTaskQueue();
   void CloseOpenCursors();
   leveldb::Status CommitPhaseTwo();
   void Timeout();
 
-  const int64 id_;
-  const std::set<int64> object_store_ids_;
+  const int64_t id_;
+  const std::set<int64_t> object_store_ids_;
   const blink::WebIDBTransactionMode mode_;
 
   bool used_;
   State state_;
   bool commit_pending_;
   scoped_refptr<IndexedDBDatabaseCallbacks> callbacks_;
   scoped_refptr<IndexedDBDatabase> database_;
 
   class TaskQueue {
    public:
@@ skipping 41 matching lines @@
   // requests are processed before the timer fires, assume the script is
   // unresponsive and abort to unblock the transaction queue.
   base::OneShotTimer timeout_timer_;
 
   Diagnostics diagnostics_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_TRANSACTION_H_