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

components/history/core/browser/history_service_unittest.cc

Index: components/history/core/browser/history_service_unittest.cc
diff --git a/components/history/core/browser/history_service_unittest.cc b/components/history/core/browser/history_service_unittest.cc
index 84390a97d944b261f8026d00dc7d9c52d787bd23..abc905aede8472d313769c132979ae5c2334a7ef 100644
--- a/components/history/core/browser/history_service_unittest.cc
+++ b/components/history/core/browser/history_service_unittest.cc
@@ -19,9 +19,12 @@
 
 #include "components/history/core/browser/history_service.h"
 
+#include <stdint.h>
+
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/location.h"
+#include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/utf_string_conversions.h"
@@ -220,7 +223,7 @@ TEST_F(HistoryServiceTest, AddRedirect) {
   EXPECT_TRUE(QueryURL(history_service_.get(), first_redirects[0]));
   EXPECT_EQ(1, query_url_row_.visit_count());
   ASSERT_EQ(1U, query_url_visits_.size());
-  int64 first_visit = query_url_visits_[0].visit_id;
+  int64_t first_visit = query_url_visits_[0].visit_id;
   EXPECT_EQ(ui::PAGE_TRANSITION_LINK | ui::PAGE_TRANSITION_CHAIN_START,
             query_url_visits_[0].transition);
   EXPECT_EQ(0, query_url_visits_[0].referring_visit);  // No referrer.
@@ -230,7 +233,7 @@ TEST_F(HistoryServiceTest, AddRedirect) {
   EXPECT_TRUE(QueryURL(history_service_.get(), first_redirects[1]));
   EXPECT_EQ(1, query_url_row_.visit_count());
   ASSERT_EQ(1U, query_url_visits_.size());
-  int64 second_visit = query_url_visits_[0].visit_id;
+  int64_t second_visit = query_url_visits_[0].visit_id;
   EXPECT_EQ(ui::PAGE_TRANSITION_SERVER_REDIRECT | ui::PAGE_TRANSITION_CHAIN_END,
             query_url_visits_[0].transition);
   EXPECT_EQ(first_visit, query_url_visits_[0].referring_visit);
@@ -629,7 +632,7 @@ TEST_F(HistoryServiceTest, ProcessLocalDeleteDirectiveSyncOnline) {
   ASSERT_TRUE(history_service_.get());
 
   const GURL test_url("http://www.google.com/");
-  for (int64 i = 1; i <= 10; ++i) {
+  for (int64_t i = 1; i <= 10; ++i) {
     base::Time t =
         base::Time::UnixEpoch() + base::TimeDelta::FromMicroseconds(i);
     history_service_->AddPage(test_url, t, NULL, 0, GURL(),
@@ -675,7 +678,7 @@ TEST_F(HistoryServiceTest, ProcessLocalDeleteDirectiveSyncOnline) {
 void CheckDirectiveProcessingResult(
     base::Time timeout,
     const syncer::FakeSyncChangeProcessor* change_processor,
-    uint32 num_changes) {
+    uint32_t num_changes) {
   if (base::Time::Now() > timeout ||
       change_processor->changes().size() >= num_changes) {
     return;
@@ -693,7 +696,7 @@ void CheckDirectiveProcessingResult(
 TEST_F(HistoryServiceTest, ProcessGlobalIdDeleteDirective) {
   ASSERT_TRUE(history_service_.get());
   const GURL test_url("http://www.google.com/");
-  for (int64 i = 1; i <= 20; i++) {
+  for (int64_t i = 1; i <= 20; i++) {
     base::Time t =
         base::Time::UnixEpoch() + base::TimeDelta::FromMicroseconds(i);
     history_service_->AddPage(test_url, t, NULL, 0, GURL(),
@@ -784,7 +787,7 @@ TEST_F(HistoryServiceTest, ProcessGlobalIdDeleteDirective) {
 TEST_F(HistoryServiceTest, ProcessTimeRangeDeleteDirective) {
   ASSERT_TRUE(history_service_.get());
   const GURL test_url("http://www.google.com/");
-  for (int64 i = 1; i <= 10; ++i) {
+  for (int64_t i = 1; i <= 10; ++i) {
     base::Time t =
         base::Time::UnixEpoch() + base::TimeDelta::FromMicroseconds(i);
     history_service_->AddPage(test_url, t, NULL, 0, GURL(),