| 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 03d8ca6ccf06cc3b8a81381ca2125b6b1ed7589b..cab8473a7a35511aa65ff37e8d85364499cfc26c 100644
|
| --- a/content/browser/indexed_db/leveldb/leveldb_database.cc
|
| +++ b/content/browser/indexed_db/leveldb/leveldb_database.cc
|
| @@ -121,9 +121,9 @@ static int CheckFreeSpace(const char* const type,
|
| 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;
|
| + 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);
|
| COMPILE_ASSERT(histogram_max <= INT_MAX, histogram_max_too_big);
|
| base::Histogram::FactoryGet(name,
|
| @@ -268,11 +268,10 @@ static void HistogramLevelDBError(const std::string& histogram_name,
|
| ParseAndHistogramCorruptionDetails(histogram_name, s);
|
| }
|
|
|
| -leveldb::Status LevelDBDatabase::Open(
|
| - const base::FilePath& file_name,
|
| - const LevelDBComparator* comparator,
|
| - scoped_ptr<LevelDBDatabase>* result,
|
| - bool* is_disk_full) {
|
| +leveldb::Status LevelDBDatabase::Open(const base::FilePath& file_name,
|
| + const LevelDBComparator* comparator,
|
| + scoped_ptr<LevelDBDatabase>* result,
|
| + bool* is_disk_full) {
|
| scoped_ptr<ComparatorAdapter> comparator_adapter(
|
| new ComparatorAdapter(comparator));
|
|
|
|
|