Switch to standard integer types in chrome/.

chrome/utility/importer/firefox_importer.cc

 // Copyright 2013 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 "chrome/utility/importer/firefox_importer.h"
 
 #include <set>
 
 #include "base/files/file_enumerator.h"
 #include "base/files/file_util.h"
 #include "base/json/json_file_value_serializer.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
 #include "chrome/common/importer/firefox_importer_utils.h"
 #include "chrome/common/importer/imported_bookmark_entry.h"
 #include "chrome/common/importer/importer_autofill_form_data_entry.h"
 #include "chrome/common/importer/importer_bridge.h"
 #include "chrome/common/importer/importer_url_row.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/utility/importer/bookmark_html_reader.h"
 #include "chrome/utility/importer/favicon_reencode.h"
 #include "chrome/utility/importer/nss_decryptor.h"
 #include "components/autofill/core/common/password_form.h"
@@ skipping 53 matching lines @@
 }  // namespace
 
 struct FirefoxImporter::BookmarkItem {
   int parent;
   int id;
   GURL url;
   base::string16 title;
   BookmarkItemType type;
   std::string keyword;
   base::Time date_added;
-  int64 favicon;
+  int64_t favicon;
   bool empty_folder;
 };
 
 FirefoxImporter::FirefoxImporter() {
 }
 
 FirefoxImporter::~FirefoxImporter() {
 }
 
-void FirefoxImporter::StartImport(
-    const importer::SourceProfile& source_profile,
-    uint16 items,
-    ImporterBridge* bridge) {
+void FirefoxImporter::StartImport(const importer::SourceProfile& source_profile,
+                                  uint16_t items,
+                                  ImporterBridge* bridge) {
   bridge_ = bridge;
   source_path_ = source_profile.source_path;
   app_path_ = source_profile.app_path;
 
 #if defined(OS_POSIX)
   locale_ = source_profile.locale;
 #endif
 
   // The order here is important!
   bridge_->NotifyStarted();
@@ skipping 670 matching lines @@
 
       if (!importer::ReencodeFavicon(&data[0], data.size(), &usage.png_data))
         continue;  // Unable to decode.
 
       usage.urls = i->second;
       favicons->push_back(usage);
     }
     s.Reset(true);
   }
 }