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

chrome/browser/importer/importer_list.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.
 
 #include "chrome/browser/importer/importer_list.h"
 
+#include <stdint.h>
+
 #include "base/bind.h"
+#include "build/build_config.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/common/importer/firefox_importer_utils.h"
 #include "chrome/common/importer/importer_bridge.h"
 #include "chrome/common/importer/importer_data_types.h"
 #include "chrome/grit/generated_resources.h"
 #include "content/public/browser/browser_thread.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_MACOSX)
 #include <CoreFoundation/CoreFoundation.h>
@@ skipping 38 matching lines @@
   if (importer::EdgeImporterCanImport())
     DetectEdgeProfiles(profiles);
   DetectIEProfiles(profiles);
 }
 
 #endif  // defined(OS_WIN)
 
 #if defined(OS_MACOSX)
 void DetectSafariProfiles(std::vector<importer::SourceProfile>* profiles) {
   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
-  uint16 items = importer::NONE;
+  uint16_t items = importer::NONE;
   if (!SafariImporterCanImport(base::mac::GetUserLibraryPath(), &items))
     return;
 
   importer::SourceProfile safari;
   safari.importer_name = l10n_util::GetStringUTF16(IDS_IMPORT_FROM_SAFARI);
   safari.importer_type = importer::TYPE_SAFARI;
   safari.services_supported = items;
   profiles->push_back(safari);
 }
 #endif  // defined(OS_MACOSX)
@@ skipping 115 matching lines @@
 }
 
 void ImporterList::SourceProfilesLoaded(
     const base::Closure& profiles_loaded_callback,
     const std::vector<importer::SourceProfile>& profiles) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   source_profiles_.assign(profiles.begin(), profiles.end());
   profiles_loaded_callback.Run();
 }