Switch to standard integer types in extensions/.

BUG=138542
TBR=benwells@chromium.org

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

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

9 files changed, 13 insertions, 1 deletions

diff --git a/extensions/common/features/base_feature_provider.cc b/extensions/common/features/base_feature_provider.cc
index 3b60e47..4f31527 100644
--- a/extensions/common/features/base_feature_provider.cc
+++ b/extensions/common/features/base_feature_provider.cc
@@ -4,6 +4,8 @@
 
 #include "extensions/common/features/base_feature_provider.h"
 
+#include <stddef.h>
+
 #include <stack>
 #include <utility>
 
diff --git a/extensions/common/features/complex_feature.h b/extensions/common/features/complex_feature.h
index 663b1e77..a1a0f67 100644
--- a/extensions/common/features/complex_feature.h
+++ b/extensions/common/features/complex_feature.h
@@ -9,6 +9,7 @@
 #include <string>
 #include <vector>
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/features/feature.h"
diff --git a/extensions/common/features/feature.cc b/extensions/common/features/feature.cc
index 21aa289..dc28d6d 100644
--- a/extensions/common/features/feature.cc
+++ b/extensions/common/features/feature.cc
@@ -10,6 +10,7 @@
 #include "base/lazy_instance.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
+#include "build/build_config.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest.h"
 
diff --git a/extensions/common/features/feature_provider.cc b/extensions/common/features/feature_provider.cc
index 79ecf73..7f93ba9 100644
--- a/extensions/common/features/feature_provider.cc
+++ b/extensions/common/features/feature_provider.cc
@@ -6,7 +6,6 @@
 
 #include <map>
 
-#include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/memory/linked_ptr.h"
diff --git a/extensions/common/features/feature_util.h b/extensions/common/features/feature_util.h
index b8d04fe..f8d6006 100644
--- a/extensions/common/features/feature_util.h
+++ b/extensions/common/features/feature_util.h
@@ -7,6 +7,7 @@
 
 #include "base/debug/alias.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/strings/string_util.h"
 
 // Writes |message| to the stack so that it shows up in the minidump, then
diff --git a/extensions/common/features/json_feature_provider_source.h b/extensions/common/features/json_feature_provider_source.h
index 7e41cca..11a4fef 100644
--- a/extensions/common/features/json_feature_provider_source.h
+++ b/extensions/common/features/json_feature_provider_source.h
@@ -7,6 +7,7 @@
 
 #include <string>
 
+#include "base/macros.h"
 #include "base/values.h"
 
 namespace extensions {
diff --git a/extensions/common/features/simple_feature.h b/extensions/common/features/simple_feature.h
index f69e658..4ff2c73 100644
--- a/extensions/common/features/simple_feature.h
+++ b/extensions/common/features/simple_feature.h
@@ -5,6 +5,8 @@
 #ifndef EXTENSIONS_COMMON_FEATURES_SIMPLE_FEATURE_H_
 #define EXTENSIONS_COMMON_FEATURES_SIMPLE_FEATURE_H_
 
+#include <stddef.h>
+
 #include <set>
 #include <string>
 #include <vector>
@@ -12,6 +14,7 @@
 #include "base/callback_forward.h"
 #include "base/gtest_prod_util.h"
 #include "base/lazy_instance.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "extensions/common/extension.h"
diff --git a/extensions/common/features/simple_feature_filter.h b/extensions/common/features/simple_feature_filter.h
index c325250..4f8a8c2 100644
--- a/extensions/common/features/simple_feature_filter.h
+++ b/extensions/common/features/simple_feature_filter.h
@@ -7,6 +7,7 @@
 
 #include <string>
 
+#include "base/macros.h"
 #include "extensions/common/features/feature.h"
 #include "extensions/common/manifest.h"
 
diff --git a/extensions/common/features/simple_feature_unittest.cc b/extensions/common/features/simple_feature_unittest.cc
index 528c565..afe8d7c 100644
--- a/extensions/common/features/simple_feature_unittest.cc
+++ b/extensions/common/features/simple_feature_unittest.cc
@@ -4,9 +4,12 @@
 
 #include "extensions/common/features/simple_feature.h"
 
+#include <stddef.h>
+
 #include <string>
 
 #include "base/command_line.h"
+#include "base/macros.h"
 #include "base/stl_util.h"
 #include "base/values.h"
 #include "extensions/common/manifest.h"