Switch to standard integer types in chrome/.

chrome/utility/importer/safari_importer_unittest.mm

Index: chrome/utility/importer/safari_importer_unittest.mm
diff --git a/chrome/utility/importer/safari_importer_unittest.mm b/chrome/utility/importer/safari_importer_unittest.mm
index 46675e13b18ae2a94ed2a8dda86057e2e490ea02..1a3201a89b053450907a7d0c2bb09632311d8758 100644
--- a/chrome/utility/importer/safari_importer_unittest.mm
+++ b/chrome/utility/importer/safari_importer_unittest.mm
@@ -4,10 +4,13 @@
 
 #include "chrome/utility/importer/safari_importer.h"
 
-#include "base/basictypes.h"
+#include <stddef.h>
+#include <stdint.h>
+
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
+#include "base/macros.h"
 #include "base/path_service.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_split.h"
@@ -258,7 +261,7 @@ TEST_F(SafariImporterTest, FaviconImport) {
 }
 
 TEST_F(SafariImporterTest, CanImport) {
-  uint16 items = importer::NONE;
+  uint16_t items = importer::NONE;
   EXPECT_TRUE(SafariImporterCanImport(
       GetTestSafariLibraryPath("default"), &items));
   EXPECT_EQ(items, importer::HISTORY | importer::FAVORITES);