Switch to standard integer types in chrome/.

chrome/utility/importer/safari_importer.mm

 // 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 <Cocoa/Cocoa.h>
 
 #include "chrome/utility/importer/safari_importer.h"
 
 #include <map>
 #include <vector>
@@ skipping 31 matching lines @@
 }  // namespace
 
 SafariImporter::SafariImporter(const base::FilePath& library_dir)
     : library_dir_(library_dir) {
 }
 
 SafariImporter::~SafariImporter() {
 }
 
 void SafariImporter::StartImport(const importer::SourceProfile& source_profile,
-                                 uint16 items,
+                                 uint16_t items,
                                  ImporterBridge* bridge) {
   bridge_ = bridge;
   // The order here is important!
   bridge_->NotifyStarted();
 
   // In keeping with import on other platforms (and for other browsers), we
   // don't import the home page (since it may lead to a useless homepage); see
   // crbug.com/25603.
   if ((items & importer::HISTORY) && !cancelled()) {
     bridge_->NotifyItemStarted(importer::HISTORY);
@@ skipping 53 matching lines @@
   const char* db_path = [favicons_db_path fileSystemRepresentation];
   return db->Open(base::FilePath(db_path));
 }
 
 void SafariImporter::ImportFaviconURLs(sql::Connection* db,
                                        FaviconMap* favicon_map) {
   const char query[] = "SELECT iconID, url FROM PageURL;";
   sql::Statement s(db->GetUniqueStatement(query));
 
   while (s.Step() && !cancelled()) {
-    int64 icon_id = s.ColumnInt64(0);
+    int64_t icon_id = s.ColumnInt64(0);
     GURL url = GURL(s.ColumnString(1));
     (*favicon_map)[icon_id].insert(url);
   }
 }
 
 void SafariImporter::LoadFaviconData(
     sql::Connection* db,
     const FaviconMap& favicon_map,
     favicon_base::FaviconUsageDataList* favicons) {
   const char query[] = "SELECT i.url, d.data "
@@ skipping 235 matching lines @@
     if (!last_visit_str)
       continue;
 
     // Convert Safari's last visit time to Unix Epoch time.
     double seconds_since_unix_epoch = HistoryTimeToEpochTime(last_visit_str);
     row.last_visit = base::Time::FromDoubleT(seconds_since_unix_epoch);
 
     history_items->push_back(row);
   }
 }