Switch to standard integer types in components/, part 2 of 4.

components/history/core/browser/history_database.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 "components/history/core/browser/history_database.h"
 
+#include <stdint.h>
+
 #include <algorithm>
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/containers/hash_tables.h"
 #include "base/files/file_util.h"
 #include "base/metrics/histogram.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/rand_util.h"
 #include "base/strings/string_util.h"
 #include "base/time/time.h"
+#include "build/build_config.h"
 #include "components/history/core/browser/url_utils.h"
 #include "sql/statement.h"
 #include "sql/transaction.h"
 
 #if defined(OS_MACOSX) && !defined(OS_IOS)
 #include "base/mac/mac_util.h"
 #endif
 
 namespace history {
 
@@ skipping 77 matching lines @@
   sql::InitStatus version_status = EnsureCurrentVersion();
   if (version_status != sql::INIT_OK)
     return version_status;
 
   return committer.Commit() ? sql::INIT_OK : sql::INIT_FAILURE;
 }
 
 void HistoryDatabase::ComputeDatabaseMetrics(
     const base::FilePath& history_name) {
   base::TimeTicks start_time = base::TimeTicks::Now();
-  int64 file_size = 0;
+  int64_t file_size = 0;
   if (!base::GetFileSize(history_name, &file_size))
     return;
   int file_mb = static_cast<int>(file_size / (1024 * 1024));
   UMA_HISTOGRAM_MEMORY_MB("History.DatabaseFileMB", file_mb);
 
   sql::Statement url_count(db_.GetUniqueStatement("SELECT count(*) FROM urls"));
   if (!url_count.Step())
     return;
   UMA_HISTOGRAM_COUNTS("History.URLTableCount", url_count.ColumnInt(0));
 
@@ skipping 72 matching lines @@
       "SELECT url, visit_count FROM urls WHERE last_visit_time > ?"));
   url_sql.BindInt64(0, one_month_ago.ToInternalValue());
 
   // Collect a map from host to visit count.
   base::hash_map<std::string, int> host_count;
   while (url_sql.Step()) {
     GURL url(url_sql.ColumnString(0));
     if (!(url.is_valid() && (url.SchemeIsHTTPOrHTTPS() || url.SchemeIs("ftp"))))
       continue;
 
-    int64 visit_count = url_sql.ColumnInt64(1);
+    int64_t visit_count = url_sql.ColumnInt64(1);
     host_count[HostForTopHosts(url)] += visit_count;
 
     // kMaxHostsInMemory is well above typical values for
     // History.MonthlyHostCount, but here to guard against unbounded memory
     // growth in the event of an atypical history.
     if (host_count.size() >= kMaxHostsInMemory)
       break;
   }
 
   // Collect the top 100 hosts by visit count, into the range
@@ skipping 92 matching lines @@
     else
       return s.ColumnInt64(0);
   }
   return 0;
 }
 
 base::Time HistoryDatabase::GetEarlyExpirationThreshold() {
   if (!cached_early_expiration_threshold_.is_null())
     return cached_early_expiration_threshold_;
 
-  int64 threshold;
+  int64_t threshold;
   if (!meta_table_.GetValue(kEarlyExpirationThresholdKey, &threshold)) {
     // Set to a very early non-zero time, so it's before all history, but not
     // zero to avoid re-retrieval.
     threshold = 1L;
   }
 
   cached_early_expiration_threshold_ = base::Time::FromInternalValue(threshold);
   return cached_early_expiration_threshold_;
 }
 
@@ skipping 172 matching lines @@
       "SET visit_time = visit_time + 11644473600000000 "
       "WHERE id IN (SELECT id FROM visits WHERE visit_time > 0);"));
   ignore_result(db_.Execute(
       "UPDATE segment_usage "
       "SET time_slot = time_slot + 11644473600000000 "
       "WHERE id IN (SELECT id FROM segment_usage WHERE time_slot > 0);"));
 }
 #endif
 
 }  // namespace history