Switch to standard integer types in content/browser/.

content/browser/indexed_db/leveldb/leveldb_database.cc

 // 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.
 
 #include "content/browser/indexed_db/leveldb/leveldb_database.h"
 
+#include <stdint.h>
+
 #include <cerrno>
 
-#include "base/basictypes.h"
 #include "base/files/file.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/sys_info.h"
+#include "build/build_config.h"
 #include "content/browser/indexed_db/indexed_db_class_factory.h"
 #include "content/browser/indexed_db/indexed_db_tracing.h"
 #include "content/browser/indexed_db/leveldb/leveldb_comparator.h"
 #include "content/browser/indexed_db/leveldb/leveldb_env.h"
 #include "content/browser/indexed_db/leveldb/leveldb_iterator_impl.h"
 #include "content/browser/indexed_db/leveldb/leveldb_write_batch.h"
 #include "third_party/leveldatabase/env_chromium.h"
 #include "third_party/leveldatabase/src/helpers/memenv/memenv.h"
 #include "third_party/leveldatabase/src/include/leveldb/db.h"
 #include "third_party/leveldatabase/src/include/leveldb/env.h"
@@ skipping 129 matching lines @@
   if (!status.ok())
     return scoped_ptr<LevelDBLock>();
   DCHECK(lock);
   return scoped_ptr<LevelDBLock>(new LockImpl(env, lock));
 }
 
 static int CheckFreeSpace(const char* const type,
                           const base::FilePath& file_name) {
   std::string name =
       std::string("WebCore.IndexedDB.LevelDB.Open") + type + "FreeDiskSpace";
-  int64 free_disk_space_in_k_bytes =
+  int64_t free_disk_space_in_k_bytes =
       base::SysInfo::AmountOfFreeDiskSpace(file_name) / 1024;
   if (free_disk_space_in_k_bytes < 0) {
     base::Histogram::FactoryGet(
         "WebCore.IndexedDB.LevelDB.FreeDiskSpaceFailure",
         1,
         2 /*boundary*/,
         2 /*boundary*/ + 1,
         base::HistogramBase::kUmaTargetedHistogramFlag)->Add(1 /*sample*/);
     return -1;
   }
   int clamped_disk_space_k_bytes = free_disk_space_in_k_bytes > INT_MAX
                                        ? INT_MAX
                                        : free_disk_space_in_k_bytes;
-  const uint64 histogram_max = static_cast<uint64>(1e9);
+  const uint64_t histogram_max = static_cast<uint64_t>(1e9);
   static_assert(histogram_max <= INT_MAX, "histogram_max too big");
   base::Histogram::FactoryGet(name,
                               1,
                               histogram_max,
                               11 /*buckets*/,
                               base::HistogramBase::kUmaTargetedHistogramFlag)
       ->Add(clamped_disk_space_k_bytes);
   return clamped_disk_space_k_bytes;
 }
 
@@ skipping 236 matching lines @@
   const leveldb::Slice start_slice = MakeSlice(start);
   const leveldb::Slice stop_slice = MakeSlice(stop);
   // NULL batch means just wait for earlier writes to be done
   db_->Write(leveldb::WriteOptions(), NULL);
   db_->CompactRange(&start_slice, &stop_slice);
 }
 
 void LevelDBDatabase::CompactAll() { db_->CompactRange(NULL, NULL); }
 
 }  // namespace content