Switch to standard integer types in xxx/.

sql/connection.cc

 // Copyright (c) 2012 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 "sql/connection.h"
 
+#include <stddef.h>
+#include <stdint.h>
 #include <string.h>
 
 #include "base/bind.h"
 #include "base/debug/dump_without_crashing.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/format_macros.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
@@ skipping 96 matching lines @@
           (attachment_point[i] >= 'a' && attachment_point[i] <= 'z') ||
           (attachment_point[i] >= 'A' && attachment_point[i] <= 'Z') ||
           attachment_point[i] == '_')) {
       return false;
     }
   }
   return true;
 }
 
 void RecordSqliteMemory10Min() {
-  const int64 used = sqlite3_memory_used();
+  const int64_t used = sqlite3_memory_used();
   UMA_HISTOGRAM_COUNTS("Sqlite.MemoryKB.TenMinutes", used / 1024);
 }
 
 void RecordSqliteMemoryHour() {
-  const int64 used = sqlite3_memory_used();
+  const int64_t used = sqlite3_memory_used();
   UMA_HISTOGRAM_COUNTS("Sqlite.MemoryKB.OneHour", used / 1024);
 }
 
 void RecordSqliteMemoryDay() {
-  const int64 used = sqlite3_memory_used();
+  const int64_t used = sqlite3_memory_used();
   UMA_HISTOGRAM_COUNTS("Sqlite.MemoryKB.OneDay", used / 1024);
 }
 
 void RecordSqliteMemoryWeek() {
-  const int64 used = sqlite3_memory_used();
+  const int64_t used = sqlite3_memory_used();
   UMA_HISTOGRAM_COUNTS("Sqlite.MemoryKB.OneWeek", used / 1024);
 }
 
 // SQLite automatically calls sqlite3_initialize() lazily, but
 // sqlite3_initialize() uses double-checked locking and thus can have
 // data races.
 //
 // TODO(shess): Another alternative would be to have
 // sqlite3_initialize() called as part of process bring-up.  If this
 // is changed, remove the dynamic_annotations dependency in sql.gyp.
@@ skipping 687 matching lines @@
 }
 
 // TODO(shess): Since this is only called in an error situation, it might be
 // prudent to rewrite in terms of SQLite API calls, and mark the function const.
 std::string Connection::CollectCorruptionInfo() {
   AssertIOAllowed();
 
   // If the file cannot be accessed it is unlikely that an integrity check will
   // turn up actionable information.
   const base::FilePath db_path = DbPath();
-  int64 db_size = -1;
+  int64_t db_size = -1;
   if (!base::GetFileSize(db_path, &db_size) || db_size < 0)
     return std::string();
 
   // Buffer for accumulating debugging info about the error.  Place
   // more-relevant information earlier, in case things overflow the
   // fixed-size reporting buffer.
   std::string debug_info;
   base::StringAppendF(&debug_info, "SQLITE_CORRUPT, db size %" PRId64 "\n",
                       db_size);
 
   // Only check files up to 8M to keep things from blocking too long.
-  const int64 kMaxIntegrityCheckSize = 8192 * 1024;
+  const int64_t kMaxIntegrityCheckSize = 8192 * 1024;
   if (db_size > kMaxIntegrityCheckSize) {
     debug_info += "integrity_check skipped due to size\n";
   } else {
     std::vector<std::string> messages;
 
     // TODO(shess): FullIntegrityCheck() splits into a vector while this joins
     // into a string.  Probably should be refactored.
     const base::TimeTicks before = base::TimeTicks::Now();
     FullIntegrityCheck(&messages);
     base::StringAppendF(
@@ skipping 1111 matching lines @@
   ignore_result(Execute(kNoWritableSchema));
 
   return ret;
 }
 
 base::TimeTicks TimeSource::Now() {
   return base::TimeTicks::Now();
 }
 
 }  // namespace sql