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

components/history/core/browser/history_backend_db_unittest.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.
 
 // History unit tests come in two flavors:
 //
 // 1. The more complicated style is that the unit test creates a full history
 //    service. This spawns a background thread for the history backend, and
 //    all communication is asynchronous. This is useful for testing more
 //    complicated things or end-to-end behavior.
 //
 // 2. The simpler style is to create a history backend on this thread and
 //    access it directly without a HistoryService object. This is much simpler
 //    because communication is synchronous. Generally, sets should go through
 //    the history backend (since there is a lot of logic) but gets can come
 //    directly from the HistoryDatabase. This is because the backend generally
 //    has no logic in the getter except threading stuff, which we don't want
 //    to run.
 
 #include "components/history/core/browser/history_backend.h"
 
+#include <stdint.h>
+
 #include "base/strings/utf_string_conversions.h"
 #include "components/history/core/browser/download_constants.h"
 #include "components/history/core/browser/download_row.h"
 #include "components/history/core/browser/history_constants.h"
 #include "components/history/core/browser/history_database.h"
 #include "components/history/core/browser/page_usage_data.h"
 #include "components/history/core/test/history_backend_db_base_test.h"
 #include "components/history/core/test/test_history_database.h"
 
 namespace history {
@@ skipping 11 matching lines @@
   CreateBackendAndDatabase();
 
   // Initially there should be nothing in the downloads database.
   std::vector<DownloadRow> downloads;
   db_->QueryDownloads(&downloads);
   EXPECT_EQ(0U, downloads.size());
 
   // Add a download, test that it was added correctly, remove it, test that it
   // was removed.
   base::Time now = base::Time();
-  uint32 id = 1;
+  uint32_t id = 1;
   EXPECT_TRUE(AddDownload(id, DownloadState::COMPLETE, base::Time()));
   db_->QueryDownloads(&downloads);
   EXPECT_EQ(1U, downloads.size());
 
   EXPECT_EQ(base::FilePath(FILE_PATH_LITERAL("current-path")),
             downloads[0].current_path);
   EXPECT_EQ(base::FilePath(FILE_PATH_LITERAL("target-path")),
             downloads[0].target_path);
   EXPECT_EQ(1UL, downloads[0].url_chain.size());
   EXPECT_EQ(GURL("foo-url"), downloads[0].url_chain[0]);
@@ skipping 94 matching lines @@
     // Re-open the db for manual manipulation.
     sql::Connection db;
     ASSERT_TRUE(db.Open(history_dir_.Append(kHistoryFilename)));
 
     // Manually insert some rows.
     sql::Statement s(db.GetUniqueStatement(
         "INSERT INTO downloads (id, full_path, url, start_time, "
         "received_bytes, total_bytes, state, end_time, opened) VALUES "
         "(?, ?, ?, ?, ?, ?, ?, ?, ?)"));
 
-    int64 id = 0;
+    int64_t id = 0;
     // Null path.
     s.BindInt64(0, ++id);
     s.BindString(1, std::string());
     s.BindString(2, "http://whatever.com/index.html");
     s.BindInt64(3, now.ToTimeT());
     s.BindInt64(4, 100);
     s.BindInt64(5, 100);
     s.BindInt(6, 1);
     s.BindInt64(7, now.ToTimeT());
     s.BindInt(8, 1);
@@ skipping 86 matching lines @@
 TEST_F(HistoryBackendDBTest, MigrateReferrer) {
   base::Time now(base::Time::Now());
   ASSERT_NO_FATAL_FAILURE(CreateDBVersion(22));
   {
     sql::Connection db;
     ASSERT_TRUE(db.Open(history_dir_.Append(kHistoryFilename)));
     sql::Statement s(db.GetUniqueStatement(
         "INSERT INTO downloads (id, full_path, url, start_time, "
         "received_bytes, total_bytes, state, end_time, opened) VALUES "
         "(?, ?, ?, ?, ?, ?, ?, ?, ?)"));
-    int64 db_handle = 0;
+    int64_t db_handle = 0;
     s.BindInt64(0, ++db_handle);
     s.BindString(1, "full_path");
     s.BindString(2, "http://whatever.com/index.html");
     s.BindInt64(3, now.ToTimeT());
     s.BindInt64(4, 100);
     s.BindInt64(5, 100);
     s.BindInt(6, 1);
     s.BindInt64(7, now.ToTimeT());
     s.BindInt(8, 1);
     ASSERT_TRUE(s.Run());
@@ skipping 220 matching lines @@
   }
 }
 
 TEST_F(HistoryBackendDBTest, ConfirmDownloadRowCreateAndDelete) {
   // Create the DB.
   CreateBackendAndDatabase();
 
   base::Time now(base::Time::Now());
 
   // Add some downloads.
-  uint32 id1 = 1, id2 = 2, id3 = 3;
+  uint32_t id1 = 1, id2 = 2, id3 = 3;
   AddDownload(id1, DownloadState::COMPLETE, now);
   AddDownload(id2, DownloadState::COMPLETE, now + base::TimeDelta::FromDays(2));
   AddDownload(id3, DownloadState::COMPLETE, now - base::TimeDelta::FromDays(2));
 
   // Confirm that resulted in the correct number of rows in the DB.
   DeleteBackend();
   {
     sql::Connection db;
     ASSERT_TRUE(db.Open(history_dir_.Append(kHistoryFilename)));
     sql::Statement statement(db.GetUniqueStatement(
@@ skipping 247 matching lines @@
       // Current browser version must be already higher than 28.
       ASSERT_LT(28, HistoryDatabase::GetCurrentVersion());
       // Expect that version in DB remains the same.
       EXPECT_EQ(28, meta.GetVersionNumber());
     }
   }
 }
 
 }  // namespace
 }  // namespace history