Switch to standard integer types in components/, part 3 of 4.

BUG=138542
TBR=blundell@chromium.org

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

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

10 files changed, 12 insertions, 2 deletions

diff --git a/components/safe_json/android/component_jni_registrar.cc b/components/safe_json/android/component_jni_registrar.cc
index f1f937b..9c7fb95 100644
--- a/components/safe_json/android/component_jni_registrar.cc
+++ b/components/safe_json/android/component_jni_registrar.cc
@@ -6,7 +6,7 @@
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_registrar.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "components/safe_json/json_sanitizer.h"
 
 namespace safe_json {
diff --git a/components/safe_json/json_sanitizer.cc b/components/safe_json/json_sanitizer.cc
index 43ede85..3cffc52 100644
--- a/components/safe_json/json_sanitizer.cc
+++ b/components/safe_json/json_sanitizer.cc
@@ -13,9 +13,11 @@
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/json/json_writer.h"
+#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
+#include "build/build_config.h"
 #include "components/safe_json/safe_json_parser.h"
 
 namespace safe_json {
diff --git a/components/safe_json/json_sanitizer.h b/components/safe_json/json_sanitizer.h
index 3f393d5..072cd75 100644
--- a/components/safe_json/json_sanitizer.h
+++ b/components/safe_json/json_sanitizer.h
@@ -9,7 +9,9 @@
 
 #include "base/callback_forward.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
+#include "build/build_config.h"
 
 #if defined(OS_ANDROID)
 #include <jni.h>
diff --git a/components/safe_json/json_sanitizer_android.cc b/components/safe_json/json_sanitizer_android.cc
index 900acab..f7f007b 100644
--- a/components/safe_json/json_sanitizer_android.cc
+++ b/components/safe_json/json_sanitizer_android.cc
@@ -8,6 +8,7 @@
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/location.h"
+#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string_util.h"
 #include "base/threading/sequenced_task_runner_handle.h"
diff --git a/components/safe_json/json_sanitizer_unittest.cc b/components/safe_json/json_sanitizer_unittest.cc
index 0a75ad3..6571eb6 100644
--- a/components/safe_json/json_sanitizer_unittest.cc
+++ b/components/safe_json/json_sanitizer_unittest.cc
@@ -9,6 +9,7 @@
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/values.h"
+#include "build/build_config.h"
 #include "components/safe_json/json_sanitizer.h"
 #include "components/safe_json/safe_json_parser.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/safe_json/safe_json_parser.cc b/components/safe_json/safe_json_parser.cc
index 653800e..7d2bbfd 100644
--- a/components/safe_json/safe_json_parser.cc
+++ b/components/safe_json/safe_json_parser.cc
@@ -4,6 +4,8 @@
 
 #include "components/safe_json/safe_json_parser.h"
 
+#include "build/build_config.h"
+
 #if defined(OS_ANDROID)
 #include "components/safe_json/safe_json_parser_android.h"
 #else
diff --git a/components/safe_json/safe_json_parser.h b/components/safe_json/safe_json_parser.h
index 704f068..962dfa6 100644
--- a/components/safe_json/safe_json_parser.h
+++ b/components/safe_json/safe_json_parser.h
@@ -7,7 +7,6 @@
 
 #include <string>
 
-#include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 
diff --git a/components/safe_json/safe_json_parser_android.h b/components/safe_json/safe_json_parser_android.h
index ba29698..3dc34b1 100644
--- a/components/safe_json/safe_json_parser_android.h
+++ b/components/safe_json/safe_json_parser_android.h
@@ -7,6 +7,7 @@
 
 #include <memory>
 
+#include "base/macros.h"
 #include "components/safe_json/safe_json_parser.h"
 
 namespace safe_json {
diff --git a/components/safe_json/safe_json_parser_impl.h b/components/safe_json/safe_json_parser_impl.h
index 277ee08..7b96c79 100644
--- a/components/safe_json/safe_json_parser_impl.h
+++ b/components/safe_json/safe_json_parser_impl.h
@@ -7,6 +7,7 @@
 
 #include <string>
 
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "components/safe_json/safe_json_parser.h"
diff --git a/components/safe_json/testing_json_parser.h b/components/safe_json/testing_json_parser.h
index 53bdb1d..4acde1f 100644
--- a/components/safe_json/testing_json_parser.h
+++ b/components/safe_json/testing_json_parser.h
@@ -5,6 +5,7 @@
 #ifndef COMPONENTS_SAFE_JSON_TESTING_JSON_PARSER_H_
 #define COMPONENTS_SAFE_JSON_TESTING_JSON_PARSER_H_
 
+#include "base/macros.h"
 #include "components/safe_json/safe_json_parser.h"
 
 namespace safe_json {