Switch to standard integer types in chrome/.

chrome/utility/importer/safari_importer.h

 // 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.
 
 #ifndef CHROME_UTILITY_IMPORTER_SAFARI_IMPORTER_H_
 #define CHROME_UTILITY_IMPORTER_SAFARI_IMPORTER_H_
 
+#include <stdint.h>
+
 #include <map>
 #include <set>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/gtest_prod_util.h"
+#include "base/macros.h"
 #include "chrome/common/importer/importer_url_row.h"
 #include "chrome/utility/importer/importer.h"
 #include "components/favicon_base/favicon_usage_data.h"
 
 #if __OBJC__
 @class NSDictionary;
 @class NSString;
 #else
 class NSDictionary;
 class NSString;
 #endif
 
 class GURL;
 struct ImportedBookmarkEntry;
 
 namespace sql {
 class Connection;
 }
 
 // Importer for Safari on OS X.
 class SafariImporter : public Importer {
  public:
   // |library_dir| is the full path to the ~/Library directory,
   // We pass it in as a parameter for testing purposes.
   explicit SafariImporter(const base::FilePath& library_dir);
 
   // Importer:
   void StartImport(const importer::SourceProfile& source_profile,
-                   uint16 items,
+                   uint16_t items,
                    ImporterBridge* bridge) override;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(SafariImporterTest, BookmarkImport);
   FRIEND_TEST_ALL_PREFIXES(SafariImporterTest,
                            BookmarkImportWithEmptyBookmarksMenu);
   FRIEND_TEST_ALL_PREFIXES(SafariImporterTest, FaviconImport);
   FRIEND_TEST_ALL_PREFIXES(SafariImporterTest, HistoryImport);
 
   ~SafariImporter() override;
 
   // Multiple URLs can share the same favicon; this is a map
   // of URLs -> IconIDs that we load as a temporary step before
   // actually loading the icons.
-  typedef std::map<int64, std::set<GURL> > FaviconMap;
+  typedef std::map<int64_t, std::set<GURL>> FaviconMap;
 
   void ImportBookmarks();
   void ImportPasswords();
   void ImportHistory();
 
   // Parse Safari's stored bookmarks.
   void ParseBookmarks(const base::string16& toolbar_name,
                       std::vector<ImportedBookmarkEntry>* bookmarks);
 
   // Function to recursively read Bookmarks out of Safari plist.
@@ skipping 25 matching lines @@
   void LoadFaviconData(sql::Connection* db,
                        const FaviconMap& favicon_map,
                        favicon_base::FaviconUsageDataList* favicons);
 
   base::FilePath library_dir_;
 
   DISALLOW_COPY_AND_ASSIGN(SafariImporter);
 };
 
 #endif  // CHROME_UTILITY_IMPORTER_SAFARI_IMPORTER_H_