Switch to standard integer types in chrome_elf/.

BUG=138542
TBR=caitkp@chromium.org

Review URL: https://codereview.chromium.org/1537333002

Cr-Commit-Position: refs/heads/master@{#366612}

8 files changed, 16 insertions, 8 deletions

diff --git a/chrome_elf/blacklist/blacklist.cc b/chrome_elf/blacklist/blacklist.cc
index 77aff7b..5cdf645 100644
--- a/chrome_elf/blacklist/blacklist.cc
+++ b/chrome_elf/blacklist/blacklist.cc
@@ -9,7 +9,6 @@
 
 #include <vector>
 
-#include "base/basictypes.h"
 #include "chrome_elf/blacklist/blacklist_interceptions.h"
 #include "chrome_elf/chrome_elf_constants.h"
 #include "chrome_elf/chrome_elf_util.h"
diff --git a/chrome_elf/blacklist/blacklist.h b/chrome_elf/blacklist/blacklist.h
index bbcf068..caf9dbb 100644
--- a/chrome_elf/blacklist/blacklist.h
+++ b/chrome_elf/blacklist/blacklist.h
@@ -9,6 +9,8 @@
 #include "sandbox/win/src/sandbox_nt_types.h"
 #endif
 
+#include <stddef.h>
+
 namespace blacklist {
 
 // Max size of the DLL blacklist.
diff --git a/chrome_elf/blacklist/blacklist_interceptions.cc b/chrome_elf/blacklist/blacklist_interceptions.cc
index 339de1a..e5e9e11 100644
--- a/chrome_elf/blacklist/blacklist_interceptions.cc
+++ b/chrome_elf/blacklist/blacklist_interceptions.cc
@@ -8,12 +8,14 @@
 
 #include "chrome_elf/blacklist/blacklist_interceptions.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <string>
 #include <vector>
 
 // Note that only #includes from base that are either header-only or built into
 // base_static (see base/base.gyp) are allowed here.
-#include "base/basictypes.h"
 #include "base/strings/string16.h"
 #include "base/win/pe_image.h"
 #include "chrome_elf/blacklist/blacklist.h"
@@ -127,7 +129,7 @@ base::string16 ExtractLoadedModuleName(const base::string16& module_path) {
 // with additional info about the image.
 void SafeGetImageInfo(const base::win::PEImage& pe,
                       std::string* out_name,
-                      uint32* flags) {
+                      uint32_t* flags) {
   out_name->clear();
   out_name->reserve(MAX_PATH);
   *flags = 0;
@@ -160,7 +162,7 @@ void SafeGetImageInfo(const base::win::PEImage& pe,
   }
 }
 
-base::string16 GetImageInfoFromLoadedModule(HMODULE module, uint32* flags) {
+base::string16 GetImageInfoFromLoadedModule(HMODULE module, uint32_t* flags) {
   std::string out_name;
   base::win::PEImage pe(module);
   SafeGetImageInfo(pe, &out_name, flags);
diff --git a/chrome_elf/blacklist/test/blacklist_test.cc b/chrome_elf/blacklist/test/blacklist_test.cc
index 44f7aaf..cdf7b29 100644
--- a/chrome_elf/blacklist/test/blacklist_test.cc
+++ b/chrome_elf/blacklist/test/blacklist_test.cc
@@ -2,10 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stddef.h>
+
 #include "base/environment.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/i18n/case_conversion.h"
+#include "base/macros.h"
 #include "base/path_service.h"
 #include "base/scoped_native_library.h"
 #include "base/strings/string16.h"
diff --git a/chrome_elf/chrome_elf_util.cc b/chrome_elf/chrome_elf_util.cc
index 7e2e710..a3fd727 100644
--- a/chrome_elf/chrome_elf_util.cc
+++ b/chrome_elf/chrome_elf_util.cc
@@ -6,6 +6,7 @@
 
 #include <assert.h>
 #include <windows.h>
+#include <stddef.h>
 
 #include "base/macros.h"
 #include "base/strings/string16.h"
diff --git a/chrome_elf/dll_hash/dll_hash.cc b/chrome_elf/dll_hash/dll_hash.cc
index d98c49d..9a35385 100644
--- a/chrome_elf/dll_hash/dll_hash.cc
+++ b/chrome_elf/dll_hash/dll_hash.cc
@@ -2,11 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stdint.h>
+
 #include "base/hash.h"
 #include "chrome_elf/dll_hash/dll_hash.h"
 
 int DllNameToHash(const std::string& dll_name) {
-  uint32 data = base::Hash(dll_name);
+  uint32_t data = base::Hash(dll_name);
 
   // Strip off the signed bit because UMA doesn't support negative values,
   // but takes a signed int as input.
diff --git a/chrome_elf/elf_imports_unittest.cc b/chrome_elf/elf_imports_unittest.cc
index 806ed79..946b9b5 100644
--- a/chrome_elf/elf_imports_unittest.cc
+++ b/chrome_elf/elf_imports_unittest.cc
@@ -9,7 +9,6 @@
 #include <vector>
 
 #include "base/base_paths.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/files/memory_mapped_file.h"
@@ -42,7 +41,7 @@ class ELFImportsTest : public testing::Test {
 
     ASSERT_TRUE(module_mmap.Initialize(module_path));
     base::win::PEImageAsData pe_image_data(
-        reinterpret_cast<HMODULE>(const_cast<uint8*>(module_mmap.data())));
+        reinterpret_cast<HMODULE>(const_cast<uint8_t*>(module_mmap.data())));
     pe_image_data.EnumImportChunks(ELFImportsTest::ImportsCallback, imports);
   }
 };
diff --git a/chrome_elf/thunk_getter.cc b/chrome_elf/thunk_getter.cc
index 32da059..64cb0b8 100644
--- a/chrome_elf/thunk_getter.cc
+++ b/chrome_elf/thunk_getter.cc
@@ -5,7 +5,7 @@
 #include <stdint.h>
 #include <windows.h>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "sandbox/win/src/interception_internal.h"
 #include "sandbox/win/src/internal_types.h"
 #include "sandbox/win/src/sandbox_utils.h"