Switch to standard integer types in chrome/.

chrome/utility/importer/safari_importer_unittest.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 "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"
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/importer/imported_bookmark_entry.h"
 #include "chrome/common/importer/importer_bridge.h"
 #include "chrome/common/importer/safari_importer_utils.h"
@@ skipping 230 matching lines @@
   EXPECT_EQ(fav1.urls.size(), 2U);
   EXPECT_TRUE(fav1.urls.find(GURL("http://www.opensearch.org/Home"))
       != fav1.urls.end());
 
   EXPECT_TRUE(fav1.urls.find(
       GURL("http://www.opensearch.org/Special:Search?search=lalala&go=Search"))
           != fav1.urls.end());
 }
 
 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);
   EXPECT_EQ(items & importer::COOKIES, importer::NONE);
   EXPECT_EQ(items & importer::PASSWORDS, importer::NONE);
   EXPECT_EQ(items & importer::SEARCH_ENGINES, importer::NONE);
   EXPECT_EQ(items & importer::HOME_PAGE, importer::NONE);
 
   // Check that we don't import anything from a bogus library directory.
   base::ScopedTempDir fake_library_dir;
   ASSERT_TRUE(fake_library_dir.CreateUniqueTempDir());
   EXPECT_FALSE(SafariImporterCanImport(fake_library_dir.path(), &items));
 }