| Index: content/browser/indexed_db/leveldb/leveldb_database.cc
|
| diff --git a/content/browser/indexed_db/leveldb/leveldb_database.cc b/content/browser/indexed_db/leveldb/leveldb_database.cc
|
| index 7efd98625c4a003801475be6b059b2906c8d795b..3bce96cc1ce917de91733962a0877cc347fe7a55 100644
|
| --- a/content/browser/indexed_db/leveldb/leveldb_database.cc
|
| +++ b/content/browser/indexed_db/leveldb/leveldb_database.cc
|
| @@ -4,11 +4,13 @@
|
|
|
| #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"
|
| @@ -16,6 +18,7 @@
|
| #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"
|
| @@ -165,7 +168,7 @@ 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(
|
| @@ -179,7 +182,7 @@ static int CheckFreeSpace(const char* const type,
|
| 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,
|
|
|