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}

78 files changed, 149 insertions, 38 deletions

diff --git a/extensions/renderer/api/automation/automation_api_helper.h b/extensions/renderer/api/automation/automation_api_helper.h
index 0f1c8b0..32aa2ef 100644
--- a/extensions/renderer/api/automation/automation_api_helper.h
+++ b/extensions/renderer/api/automation/automation_api_helper.h
@@ -5,6 +5,7 @@
 #ifndef EXTENSIONS_RENDERER_API_AUTOMATION_AUTOMATION_API_HELPER_H_
 #define EXTENSIONS_RENDERER_API_AUTOMATION_AUTOMATION_API_HELPER_H_
 
+#include "base/macros.h"
 #include "base/strings/string16.h"
 #include "content/public/renderer/render_view_observer.h"
 
diff --git a/extensions/renderer/api/mojo_private/mojo_private_unittest.cc b/extensions/renderer/api/mojo_private/mojo_private_unittest.cc
index af1801e..344cbe9 100644
--- a/extensions/renderer/api/mojo_private/mojo_private_unittest.cc
+++ b/extensions/renderer/api/mojo_private/mojo_private_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "extensions/renderer/api_test_base.h"
 
+#include "base/macros.h"
 #include "gin/modules/module_registry.h"
 
 // A test launcher for tests for the mojoPrivate API defined in
diff --git a/extensions/renderer/api/serial/data_receiver_unittest.cc b/extensions/renderer/api/serial/data_receiver_unittest.cc
index c650866..126b041 100644
--- a/extensions/renderer/api/serial/data_receiver_unittest.cc
+++ b/extensions/renderer/api/serial/data_receiver_unittest.cc
@@ -2,9 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stdint.h>
+
 #include <queue>
 #include <utility>
 
+#include "base/macros.h"
 #include "device/serial/data_source_sender.h"
 #include "device/serial/data_stream.mojom.h"
 #include "extensions/renderer/api_test_base.h"
diff --git a/extensions/renderer/api/serial/data_sender_unittest.cc b/extensions/renderer/api/serial/data_sender_unittest.cc
index dfda6cd..c9a75cc 100644
--- a/extensions/renderer/api/serial/data_sender_unittest.cc
+++ b/extensions/renderer/api/serial/data_sender_unittest.cc
@@ -2,9 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stdint.h>
+
 #include <queue>
 #include <utility>
 
+#include "base/macros.h"
 #include "device/serial/data_sink_receiver.h"
 #include "device/serial/data_stream.mojom.h"
 #include "extensions/renderer/api_test_base.h"
diff --git a/extensions/renderer/api/serial/serial_api_unittest.cc b/extensions/renderer/api/serial/serial_api_unittest.cc
index 216ac5c..0e30cfb 100644
--- a/extensions/renderer/api/serial/serial_api_unittest.cc
+++ b/extensions/renderer/api/serial/serial_api_unittest.cc
@@ -2,8 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <utility>
 
+#include "base/macros.h"
 #include "base/thread_task_runner_handle.h"
 #include "device/serial/serial_device_enumerator.h"
 #include "device/serial/serial_service_impl.h"
diff --git a/extensions/renderer/api_activity_logger.cc b/extensions/renderer/api_activity_logger.cc
index f92ce53..e78c274 100644
--- a/extensions/renderer/api_activity_logger.cc
+++ b/extensions/renderer/api_activity_logger.cc
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stddef.h>
+
 #include <string>
 
 #include "base/bind.h"
diff --git a/extensions/renderer/api_activity_logger.h b/extensions/renderer/api_activity_logger.h
index 13f23f9..63a4699 100644
--- a/extensions/renderer/api_activity_logger.h
+++ b/extensions/renderer/api_activity_logger.h
@@ -7,6 +7,7 @@
 
 #include <string>
 
+#include "base/macros.h"
 #include "extensions/common/features/feature.h"
 #include "extensions/renderer/object_backed_native_handler.h"
 #include "v8/include/v8.h"
diff --git a/extensions/renderer/api_definitions_natives.h b/extensions/renderer/api_definitions_natives.h
index e6da645..dcc1b73 100644
--- a/extensions/renderer/api_definitions_natives.h
+++ b/extensions/renderer/api_definitions_natives.h
@@ -5,6 +5,7 @@
 #ifndef EXTENSIONS_RENDERER_API_DEFINITIONS_NATIVES_H_
 #define EXTENSIONS_RENDERER_API_DEFINITIONS_NATIVES_H_
 
+#include "base/macros.h"
 #include "extensions/renderer/object_backed_native_handler.h"
 #include "v8/include/v8.h"
 
diff --git a/extensions/renderer/app_window_custom_bindings.cc b/extensions/renderer/app_window_custom_bindings.cc
index 448a46c..b61c384 100644
--- a/extensions/renderer/app_window_custom_bindings.cc
+++ b/extensions/renderer/app_window_custom_bindings.cc
@@ -7,6 +7,7 @@
 #include <string>
 
 #include "base/command_line.h"
+#include "base/macros.h"
 #include "content/public/child/v8_value_converter.h"
 #include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_frame_observer.h"
diff --git a/extensions/renderer/app_window_custom_bindings.h b/extensions/renderer/app_window_custom_bindings.h
index 68786a0..26e02c7 100644
--- a/extensions/renderer/app_window_custom_bindings.h
+++ b/extensions/renderer/app_window_custom_bindings.h
@@ -5,6 +5,7 @@
 #ifndef EXTENSIONS_RENDERER_APP_WINDOW_CUSTOM_BINDINGS_H_
 #define EXTENSIONS_RENDERER_APP_WINDOW_CUSTOM_BINDINGS_H_
 
+#include "base/macros.h"
 #include "extensions/renderer/object_backed_native_handler.h"
 
 namespace extensions {
diff --git a/extensions/renderer/binding_generating_native_handler.cc b/extensions/renderer/binding_generating_native_handler.cc
index 7bb9f1a..8912017 100644
--- a/extensions/renderer/binding_generating_native_handler.cc
+++ b/extensions/renderer/binding_generating_native_handler.cc
@@ -4,6 +4,7 @@
 
 #include "extensions/renderer/binding_generating_native_handler.h"
 
+#include "base/macros.h"
 #include "extensions/renderer/script_context.h"
 #include "extensions/renderer/v8_helpers.h"
 
diff --git a/extensions/renderer/console.cc b/extensions/renderer/console.cc
index c2a93c2..6416074 100644
--- a/extensions/renderer/console.cc
+++ b/extensions/renderer/console.cc
@@ -7,6 +7,7 @@
 #include "base/compiler_specific.h"
 #include "base/debug/alias.h"
 #include "base/lazy_instance.h"
+#include "base/macros.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
diff --git a/extensions/renderer/content_watcher.cc b/extensions/renderer/content_watcher.cc
index 75740b5..d16f356 100644
--- a/extensions/renderer/content_watcher.cc
+++ b/extensions/renderer/content_watcher.cc
@@ -4,6 +4,8 @@
 
 #include "extensions/renderer/content_watcher.h"
 
+#include <stddef.h>
+
 #include "content/public/renderer/render_view.h"
 #include "content/public/renderer/render_view_visitor.h"
 #include "extensions/common/extension_messages.h"
diff --git a/extensions/renderer/context_menus_custom_bindings.cc b/extensions/renderer/context_menus_custom_bindings.cc
index 3f9d4ff..40f4705 100644
--- a/extensions/renderer/context_menus_custom_bindings.cc
+++ b/extensions/renderer/context_menus_custom_bindings.cc
@@ -4,6 +4,8 @@
 
 #include "extensions/renderer/context_menus_custom_bindings.h"
 
+#include <stdint.h>
+
 #include "base/bind.h"
 #include "content/public/renderer/render_thread.h"
 #include "extensions/common/extension_messages.h"
diff --git a/extensions/renderer/dispatcher.cc b/extensions/renderer/dispatcher.cc
index a674504..7ec76ad 100644
--- a/extensions/renderer/dispatcher.cc
+++ b/extensions/renderer/dispatcher.cc
@@ -4,6 +4,8 @@
 
 #include "extensions/renderer/dispatcher.h"
 
+#include <stddef.h>
+
 #include <utility>
 
 #include "base/bind.h"
@@ -12,6 +14,7 @@
 #include "base/command_line.h"
 #include "base/debug/alias.h"
 #include "base/lazy_instance.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/user_metrics_action.h"
@@ -21,6 +24,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "base/values.h"
+#include "build/build_config.h"
 #include "content/grit/content_resources.h"
 #include "content/public/child/v8_value_converter.h"
 #include "content/public/common/browser_plugin_guest_mode.h"
@@ -125,8 +129,8 @@ namespace extensions {
 
 namespace {
 
-static const int64 kInitialExtensionIdleHandlerDelayMs = 5 * 1000;
-static const int64 kMaxExtensionIdleHandlerDelayMs = 5 * 60 * 1000;
+static const int64_t kInitialExtensionIdleHandlerDelayMs = 5 * 1000;
+static const int64_t kMaxExtensionIdleHandlerDelayMs = 5 * 60 * 1000;
 static const char kEventDispatchFunction[] = "dispatchEvent";
 static const char kOnSuspendEvent[] = "runtime.onSuspend";
 static const char kOnSuspendCanceledEvent[] = "runtime.onSuspendCanceled";
@@ -935,7 +939,7 @@ void Dispatcher::IdleNotification() {
     // Dampen the forced delay as well if the extension stays idle for long
     // periods of time. (forced_idle_timer_ can be NULL after
     // OnRenderProcessShutdown has been called.)
-    int64 forced_delay_ms =
+    int64_t forced_delay_ms =
         std::max(RenderThread::Get()->GetIdleNotificationDelayInMs(),
                  kMaxExtensionIdleHandlerDelayMs);
     forced_idle_timer_->Stop();
@@ -1097,7 +1101,7 @@ void Dispatcher::OnSetWebViewPartitionID(const std::string& partition_id) {
 }
 
 void Dispatcher::OnShouldSuspend(const std::string& extension_id,
-                                 uint64 sequence_id) {
+                                 uint64_t sequence_id) {
   RenderThread::Get()->Send(
       new ExtensionHostMsg_ShouldSuspendAck(extension_id, sequence_id));
 }
diff --git a/extensions/renderer/dispatcher.h b/extensions/renderer/dispatcher.h
index 434dcde..40194a0 100644
--- a/extensions/renderer/dispatcher.h
+++ b/extensions/renderer/dispatcher.h
@@ -5,6 +5,8 @@
 #ifndef EXTENSIONS_RENDERER_DISPATCHER_H_
 #define EXTENSIONS_RENDERER_DISPATCHER_H_
 
+#include <stdint.h>
+
 #include <map>
 #include <set>
 #include <string>
@@ -12,6 +14,7 @@
 #include <vector>
 
 #include "base/gtest_prod_util.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/scoped_observer.h"
 #include "base/timer/timer.h"
@@ -172,7 +175,7 @@ class Dispatcher : public content::RenderProcessObserver,
   void OnSetSystemFont(const std::string& font_family,
                        const std::string& font_size);
   void OnSetWebViewPartitionID(const std::string& partition_id);
-  void OnShouldSuspend(const std::string& extension_id, uint64 sequence_id);
+  void OnShouldSuspend(const std::string& extension_id, uint64_t sequence_id);
   void OnSuspend(const std::string& extension_id);
   void OnTransferBlobs(const std::vector<std::string>& blob_uuids);
   void OnUnloaded(const std::string& id);
diff --git a/extensions/renderer/display_source_custom_bindings.cc b/extensions/renderer/display_source_custom_bindings.cc
index 059d2bb..8be830c 100644
--- a/extensions/renderer/display_source_custom_bindings.cc
+++ b/extensions/renderer/display_source_custom_bindings.cc
@@ -4,6 +4,8 @@
 
 #include "extensions/renderer/display_source_custom_bindings.h"
 
+#include <stdint.h>
+
 #include "base/bind.h"
 #include "content/public/child/v8_value_converter.h"
 #include "extensions/renderer/script_context.h"
@@ -50,7 +52,7 @@ v8::Local<v8::Value> GetChildValue(v8::Local<v8::Object> value,
                                    const std::string& key_name,
                                    v8::Isolate* isolate) {
   v8::Local<v8::Array> property_names(value->GetOwnPropertyNames());
-  for (uint32 i = 0; i < property_names->Length(); ++i) {
+  for (uint32_t i = 0; i < property_names->Length(); ++i) {
     v8::Local<v8::Value> key(property_names->Get(i));
     if (key_name == *v8::String::Utf8Value(key)) {
       v8::TryCatch try_catch(isolate);
diff --git a/extensions/renderer/event_bindings.cc b/extensions/renderer/event_bindings.cc
index b92ed6c..87b8349 100644
--- a/extensions/renderer/event_bindings.cc
+++ b/extensions/renderer/event_bindings.cc
@@ -4,10 +4,11 @@
 
 #include "extensions/renderer/event_bindings.h"
 
+#include <stdint.h>
+
 #include <map>
 #include <utility>
 
-#include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
diff --git a/extensions/renderer/extension_frame_helper.h b/extensions/renderer/extension_frame_helper.h
index e6f542e..a710d4f 100644
--- a/extensions/renderer/extension_frame_helper.h
+++ b/extensions/renderer/extension_frame_helper.h
@@ -7,6 +7,7 @@
 
 #include <vector>
 
+#include "base/macros.h"
 #include "content/public/common/console_message_level.h"
 #include "content/public/renderer/render_frame_observer.h"
 #include "content/public/renderer/render_frame_observer_tracker.h"
diff --git a/extensions/renderer/extension_helper.cc b/extensions/renderer/extension_helper.cc
index 7be6426..8eb0cc8 100644
--- a/extensions/renderer/extension_helper.cc
+++ b/extensions/renderer/extension_helper.cc
@@ -4,6 +4,8 @@
 
 #include "extensions/renderer/extension_helper.h"
 
+#include <stddef.h>
+
 #include "content/public/renderer/render_view.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension_messages.h"
diff --git a/extensions/renderer/extension_helper.h b/extensions/renderer/extension_helper.h
index 0892fa8..a25a0a3 100644
--- a/extensions/renderer/extension_helper.h
+++ b/extensions/renderer/extension_helper.h
@@ -7,6 +7,7 @@
 
 #include <string>
 
+#include "base/macros.h"
 #include "content/public/renderer/render_view_observer.h"
 
 namespace extensions {
diff --git a/extensions/renderer/extension_injection_host.h b/extensions/renderer/extension_injection_host.h
index 8996415..a3c9d32 100644
--- a/extensions/renderer/extension_injection_host.h
+++ b/extensions/renderer/extension_injection_host.h
@@ -5,6 +5,7 @@
 #ifndef EXTENSIONS_RENDERER_EXTENSION_INJECTION_HOST_H_
 #define EXTENSIONS_RENDERER_EXTENSION_INJECTION_HOST_H_
 
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "extensions/common/extension.h"
 #include "extensions/renderer/injection_host.h"
diff --git a/extensions/renderer/extensions_render_frame_observer.cc b/extensions/renderer/extensions_render_frame_observer.cc
index f75e27c..dd94caf 100644
--- a/extensions/renderer/extensions_render_frame_observer.cc
+++ b/extensions/renderer/extensions_render_frame_observer.cc
@@ -4,6 +4,8 @@
 
 #include "extensions/renderer/extensions_render_frame_observer.h"
 
+#include <stddef.h>
+
 #include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/renderer/render_frame.h"
@@ -28,11 +30,10 @@ const char kStackFrameDelimiter[] = "\n    at ";
 //    the given line number and source.
 // |message| will be populated with the error message only (i.e., will not
 // include any stack trace).
-StackTrace GetStackTraceFromMessage(
-    base::string16* message,
-    const base::string16& source,
-    const base::string16& stack_trace,
-    int32 line_number) {
+StackTrace GetStackTraceFromMessage(base::string16* message,
+                                    const base::string16& source,
+                                    const base::string16& stack_trace,
+                                    int32_t line_number) {
   StackTrace result;
   std::vector<base::string16> pieces;
   size_t index = 0;
@@ -84,8 +85,8 @@ void ExtensionsRenderFrameObserver::DetailedConsoleMessageAdded(
     const base::string16& message,
     const base::string16& source,
     const base::string16& stack_trace_string,
-    int32 line_number,
-    int32 severity_level) {
+    int32_t line_number,
+    int32_t severity_level) {
   base::string16 trimmed_message = message;
   StackTrace stack_trace = GetStackTraceFromMessage(
       &trimmed_message,
diff --git a/extensions/renderer/extensions_render_frame_observer.h b/extensions/renderer/extensions_render_frame_observer.h
index fb2f444..391a33f 100644
--- a/extensions/renderer/extensions_render_frame_observer.h
+++ b/extensions/renderer/extensions_render_frame_observer.h
@@ -5,7 +5,9 @@
 #ifndef EXTENSIONS_RENDERER_EXTENSIONS_RENDER_FRAME_OBSERVER_H_
 #define EXTENSIONS_RENDERER_EXTENSIONS_RENDER_FRAME_OBSERVER_H_
 
-#include "base/basictypes.h"
+#include <stdint.h>
+
+#include "base/macros.h"
 #include "content/public/renderer/render_frame_observer.h"
 
 namespace extensions {
@@ -24,8 +26,8 @@ class ExtensionsRenderFrameObserver
   void DetailedConsoleMessageAdded(const base::string16& message,
                                    const base::string16& source,
                                    const base::string16& stack_trace,
-                                   int32 line_number,
-                                   int32 severity_level) override;
+                                   int32_t line_number,
+                                   int32_t severity_level) override;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionsRenderFrameObserver);
 };
diff --git a/extensions/renderer/extensions_renderer_client.cc b/extensions/renderer/extensions_renderer_client.cc
index 91c5aeb..26c46ed 100644
--- a/extensions/renderer/extensions_renderer_client.cc
+++ b/extensions/renderer/extensions_renderer_client.cc
@@ -4,7 +4,6 @@
 
 #include "extensions/renderer/extensions_renderer_client.h"
 
-#include "base/basictypes.h"
 #include "base/logging.h"
 
 namespace extensions {
diff --git a/extensions/renderer/file_system_natives.h b/extensions/renderer/file_system_natives.h
index ed6970c..102f220 100644
--- a/extensions/renderer/file_system_natives.h
+++ b/extensions/renderer/file_system_natives.h
@@ -6,6 +6,7 @@
 #define EXTENSIONS_RENDERER_FILE_SYSTEM_NATIVES_H_
 
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "extensions/renderer/object_backed_native_handler.h"
 
 namespace extensions {
diff --git a/extensions/renderer/gc_callback.h b/extensions/renderer/gc_callback.h
index 072c191..96dc244 100644
--- a/extensions/renderer/gc_callback.h
+++ b/extensions/renderer/gc_callback.h
@@ -8,8 +8,8 @@
 #include <map>
 #include <string>
 
-#include "base/basictypes.h"
 #include "base/callback.h"
+#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "v8/include/v8.h"
 
diff --git a/extensions/renderer/gc_callback_unittest.cc b/extensions/renderer/gc_callback_unittest.cc
index 396e322..f1b70ba 100644
--- a/extensions/renderer/gc_callback_unittest.cc
+++ b/extensions/renderer/gc_callback_unittest.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/bind.h"
+#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "extensions/common/extension.h"
diff --git a/extensions/renderer/guest_view/extensions_guest_view_container.h b/extensions/renderer/guest_view/extensions_guest_view_container.h
index 35f2211..bc95b18 100644
--- a/extensions/renderer/guest_view/extensions_guest_view_container.h
+++ b/extensions/renderer/guest_view/extensions_guest_view_container.h
@@ -7,6 +7,7 @@
 
 #include <queue>
 
+#include "base/macros.h"
 #include "components/guest_view/renderer/guest_view_container.h"
 #include "v8/include/v8.h"
 
diff --git a/extensions/renderer/guest_view/extensions_guest_view_container_dispatcher.h b/extensions/renderer/guest_view/extensions_guest_view_container_dispatcher.h
index 8d1d36a..b04ee04 100644
--- a/extensions/renderer/guest_view/extensions_guest_view_container_dispatcher.h
+++ b/extensions/renderer/guest_view/extensions_guest_view_container_dispatcher.h
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/macros.h"
 #include "components/guest_view/renderer/guest_view_container_dispatcher.h"
 
 namespace extensions {
diff --git a/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc b/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc
index 7d34c75..91f8197 100644
--- a/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc
+++ b/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc
@@ -7,6 +7,7 @@
 #include <map>
 #include <set>
 
+#include "base/macros.h"
 #include "components/guest_view/common/guest_view_constants.h"
 #include "components/guest_view/common/guest_view_messages.h"
 #include "content/public/child/v8_value_converter.h"
diff --git a/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.h b/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.h
index 796358e..6c98abe 100644
--- a/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.h
+++ b/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.h
@@ -5,9 +5,12 @@
 #ifndef EXTENSIONS_RENDERER_GUEST_VIEW_MIME_HANDLER_VIEW_MIME_HANDLER_VIEW_CONTAINER_H_
 #define EXTENSIONS_RENDERER_GUEST_VIEW_MIME_HANDLER_VIEW_MIME_HANDLER_VIEW_CONTAINER_H_
 
+#include <stdint.h>
+
 #include <string>
 #include <vector>
 
+#include "base/macros.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "components/guest_view/renderer/guest_view_container.h"
diff --git a/extensions/renderer/i18n_custom_bindings.cc b/extensions/renderer/i18n_custom_bindings.cc
index 386b22e..365f50a 100644
--- a/extensions/renderer/i18n_custom_bindings.cc
+++ b/extensions/renderer/i18n_custom_bindings.cc
@@ -4,9 +4,13 @@
 
 #include "extensions/renderer/i18n_custom_bindings.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <vector>
 
 #include "base/bind.h"
+#include "base/macros.h"
 #include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_thread.h"
 #include "extensions/common/extension_messages.h"
diff --git a/extensions/renderer/id_generator_custom_bindings.cc b/extensions/renderer/id_generator_custom_bindings.cc
index f9c593b..182c454 100644
--- a/extensions/renderer/id_generator_custom_bindings.cc
+++ b/extensions/renderer/id_generator_custom_bindings.cc
@@ -4,6 +4,8 @@
 
 #include "extensions/renderer/id_generator_custom_bindings.h"
 
+#include <stdint.h>
+
 #include "base/bind.h"
 
 namespace extensions {
diff --git a/extensions/renderer/injection_host.h b/extensions/renderer/injection_host.h
index cd37a33..21a4c0e 100644
--- a/extensions/renderer/injection_host.h
+++ b/extensions/renderer/injection_host.h
@@ -5,6 +5,7 @@
 #ifndef EXTENSIONS_RENDERER_INJECTION_HOST_H
 #define EXTENSIONS_RENDERER_INJECTION_HOST_H
 
+#include "base/macros.h"
 #include "extensions/common/host_id.h"
 #include "extensions/common/permissions/permissions_data.h"
 #include "url/gurl.h"
diff --git a/extensions/renderer/messaging_bindings.cc b/extensions/renderer/messaging_bindings.cc
index 777f24f..a0a855f 100644
--- a/extensions/renderer/messaging_bindings.cc
+++ b/extensions/renderer/messaging_bindings.cc
@@ -4,14 +4,16 @@
 
 #include "extensions/renderer/messaging_bindings.h"
 
+#include <stdint.h>
+
 #include <map>
 #include <string>
 
-#include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/lazy_instance.h"
+#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/values.h"
@@ -177,7 +179,7 @@ class ExtensionImpl : public ObjectBackedNativeHandler {
     if (!renderframe)
       return;
 
-    // Arguments are (int32 port_id, string message).
+    // Arguments are (int32_t port_id, string message).
     CHECK(args.Length() == 2 && args[0]->IsInt32() && args[1]->IsString());
 
     int port_id = args[0].As<v8::Int32>()->Value();
@@ -196,7 +198,7 @@ class ExtensionImpl : public ObjectBackedNativeHandler {
 
   // Forcefully disconnects a port.
   void CloseChannel(const v8::FunctionCallbackInfo<v8::Value>& args) {
-    // Arguments are (int32 port_id, boolean notify_browser).
+    // Arguments are (int32_t port_id, boolean notify_browser).
     CHECK_EQ(2, args.Length());
     CHECK(args[0]->IsInt32());
     CHECK(args[1]->IsBoolean());
@@ -218,7 +220,7 @@ class ExtensionImpl : public ObjectBackedNativeHandler {
   // A new port has been created for a context.  This occurs both when script
   // opens a connection, and when a connection is opened to this script.
   void PortAddRef(const v8::FunctionCallbackInfo<v8::Value>& args) {
-    // Arguments are (int32 port_id).
+    // Arguments are (int32_t port_id).
     CHECK_EQ(1, args.Length());
     CHECK(args[0]->IsInt32());
 
@@ -230,7 +232,7 @@ class ExtensionImpl : public ObjectBackedNativeHandler {
   // frames with a reference to a given port, we will disconnect it and notify
   // the other end of the channel.
   void PortRelease(const v8::FunctionCallbackInfo<v8::Value>& args) {
-    // Arguments are (int32 port_id).
+    // Arguments are (int32_t port_id).
     CHECK(args.Length() == 1 && args[0]->IsInt32());
     ReleasePort(args[0].As<v8::Int32>()->Value());
   }
diff --git a/extensions/renderer/module_system.cc b/extensions/renderer/module_system.cc
index a2379ea..ef96d73 100644
--- a/extensions/renderer/module_system.cc
+++ b/extensions/renderer/module_system.cc
@@ -7,6 +7,7 @@
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/trace_event/trace_event.h"
diff --git a/extensions/renderer/module_system.h b/extensions/renderer/module_system.h
index 45e9c44..134d2ba 100644
--- a/extensions/renderer/module_system.h
+++ b/extensions/renderer/module_system.h
@@ -12,6 +12,7 @@
 #include <vector>
 
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "extensions/renderer/native_handler.h"
 #include "extensions/renderer/object_backed_native_handler.h"
diff --git a/extensions/renderer/module_system_test.cc b/extensions/renderer/module_system_test.cc
index 0db5495..68c4bd1 100644
--- a/extensions/renderer/module_system_test.cc
+++ b/extensions/renderer/module_system_test.cc
@@ -4,6 +4,8 @@
 
 #include "extensions/renderer/module_system_test.h"
 
+#include <stddef.h>
+
 #include <map>
 #include <string>
 #include <utility>
diff --git a/extensions/renderer/module_system_test.h b/extensions/renderer/module_system_test.h
index 75f7d9c..517c308 100644
--- a/extensions/renderer/module_system_test.h
+++ b/extensions/renderer/module_system_test.h
@@ -5,6 +5,7 @@
 #ifndef EXTENSIONS_RENDERER_MODULE_SYSTEM_TEST_H_
 #define EXTENSIONS_RENDERER_MODULE_SYSTEM_TEST_H_
 
+#include "base/macros.h"
 #include "extensions/renderer/module_system.h"
 #include "extensions/renderer/script_context.h"
 #include "gin/public/context_holder.h"
diff --git a/extensions/renderer/module_system_unittest.cc b/extensions/renderer/module_system_unittest.cc
index d84e31e..f49b3b9 100644
--- a/extensions/renderer/module_system_unittest.cc
+++ b/extensions/renderer/module_system_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "extensions/renderer/module_system.h"
 
+#include <stdint.h>
+
 #include <utility>
 
 #include "base/memory/scoped_ptr.h"
diff --git a/extensions/renderer/mojo/keep_alive_client_unittest.cc b/extensions/renderer/mojo/keep_alive_client_unittest.cc
index 2d9c63c..022d2d2 100644
--- a/extensions/renderer/mojo/keep_alive_client_unittest.cc
+++ b/extensions/renderer/mojo/keep_alive_client_unittest.cc
@@ -4,6 +4,7 @@
 
 #include <utility>
 
+#include "base/macros.h"
 #include "extensions/common/mojo/keep_alive.mojom.h"
 #include "extensions/renderer/api_test_base.h"
 #include "grit/extensions_renderer_resources.h"
diff --git a/extensions/renderer/mojo/stash_client_unittest.cc b/extensions/renderer/mojo/stash_client_unittest.cc
index e92abe9..cddd20d 100644
--- a/extensions/renderer/mojo/stash_client_unittest.cc
+++ b/extensions/renderer/mojo/stash_client_unittest.cc
@@ -4,6 +4,7 @@
 
 #include <vector>
 
+#include "base/macros.h"
 #include "extensions/browser/mojo/stash_backend.h"
 #include "extensions/common/mojo/stash.mojom.h"
 #include "extensions/renderer/api_test_base.h"
diff --git a/extensions/renderer/native_handler.h b/extensions/renderer/native_handler.h
index de1b9f5..5b3d3f7 100644
--- a/extensions/renderer/native_handler.h
+++ b/extensions/renderer/native_handler.h
@@ -5,7 +5,7 @@
 #ifndef EXTENSIONS_RENDERER_NATIVE_HANDLER_H_
 #define EXTENSIONS_RENDERER_NATIVE_HANDLER_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "v8/include/v8.h"
 
 namespace extensions {
diff --git a/extensions/renderer/object_backed_native_handler.cc b/extensions/renderer/object_backed_native_handler.cc
index 421b273..109fae1 100644
--- a/extensions/renderer/object_backed_native_handler.cc
+++ b/extensions/renderer/object_backed_native_handler.cc
@@ -4,6 +4,8 @@
 
 #include "extensions/renderer/object_backed_native_handler.h"
 
+#include <stddef.h>
+
 #include "base/logging.h"
 #include "base/memory/linked_ptr.h"
 #include "extensions/renderer/console.h"
diff --git a/extensions/renderer/object_backed_native_handler.h b/extensions/renderer/object_backed_native_handler.h
index a60a33a..9842b0b 100644
--- a/extensions/renderer/object_backed_native_handler.h
+++ b/extensions/renderer/object_backed_native_handler.h
@@ -9,6 +9,7 @@
 #include <vector>
 
 #include "base/bind.h"
+#include "base/macros.h"
 #include "base/memory/linked_ptr.h"
 #include "extensions/renderer/native_handler.h"
 #include "v8/include/v8-util.h"
diff --git a/extensions/renderer/process_info_native_handler.cc b/extensions/renderer/process_info_native_handler.cc
index b8fcb57..545a212 100644
--- a/extensions/renderer/process_info_native_handler.cc
+++ b/extensions/renderer/process_info_native_handler.cc
@@ -4,6 +4,8 @@
 
 #include "extensions/renderer/process_info_native_handler.h"
 
+#include <stdint.h>
+
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "extensions/renderer/script_context.h"
diff --git a/extensions/renderer/render_frame_observer_natives.cc b/extensions/renderer/render_frame_observer_natives.cc
index 5ee47b7..c3a147d 100644
--- a/extensions/renderer/render_frame_observer_natives.cc
+++ b/extensions/renderer/render_frame_observer_natives.cc
@@ -5,6 +5,7 @@
 #include "extensions/renderer/render_frame_observer_natives.h"
 
 #include "base/bind.h"
+#include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_frame_observer.h"
diff --git a/extensions/renderer/render_frame_observer_natives.h b/extensions/renderer/render_frame_observer_natives.h
index c001caa..946377d 100644
--- a/extensions/renderer/render_frame_observer_natives.h
+++ b/extensions/renderer/render_frame_observer_natives.h
@@ -5,6 +5,7 @@
 #ifndef EXTENSIONS_RENDERER_RENDER_FRAME_OBSERVER_NATIVES_H_
 #define EXTENSIONS_RENDERER_RENDER_FRAME_OBSERVER_NATIVES_H_
 
+#include "base/macros.h"
 #include "extensions/renderer/object_backed_native_handler.h"
 
 namespace extensions {
diff --git a/extensions/renderer/renderer_extension_registry.h b/extensions/renderer/renderer_extension_registry.h
index 6a887a1..97c24bb 100644
--- a/extensions/renderer/renderer_extension_registry.h
+++ b/extensions/renderer/renderer_extension_registry.h
@@ -5,8 +5,11 @@
 #ifndef EXTENSIONS_RENDERER_RENDERER_EXTENSION_REGISTRY_H_
 #define EXTENSIONS_RENDERER_RENDERER_EXTENSION_REGISTRY_H_
 
+#include <stddef.h>
+
 #include <string>
 
+#include "base/macros.h"
 #include "base/synchronization/lock.h"
 #include "extensions/common/extension_set.h"
 
diff --git a/extensions/renderer/request_sender.h b/extensions/renderer/request_sender.h
index c3b8538..245c0fe 100644
--- a/extensions/renderer/request_sender.h
+++ b/extensions/renderer/request_sender.h
@@ -8,6 +8,7 @@
 #include <map>
 #include <string>
 
+#include "base/macros.h"
 #include "base/memory/linked_ptr.h"
 #include "v8/include/v8.h"
 
diff --git a/extensions/renderer/runtime_custom_bindings.cc b/extensions/renderer/runtime_custom_bindings.cc
index c6d3ba0..915abf8 100644
--- a/extensions/renderer/runtime_custom_bindings.cc
+++ b/extensions/renderer/runtime_custom_bindings.cc
@@ -4,6 +4,8 @@
 
 #include "extensions/renderer/runtime_custom_bindings.h"
 
+#include <stdint.h>
+
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
diff --git a/extensions/renderer/scoped_web_frame.h b/extensions/renderer/scoped_web_frame.h
index 7950552..948a289 100644
--- a/extensions/renderer/scoped_web_frame.h
+++ b/extensions/renderer/scoped_web_frame.h
@@ -5,6 +5,7 @@
 #ifndef SCOPED_WEB_FRAME_H_
 #define SCOPED_WEB_FRAME_H_
 
+#include "base/macros.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebView.h"
 
diff --git a/extensions/renderer/script_context.cc b/extensions/renderer/script_context.cc
index 8257e8e..7987236 100644
--- a/extensions/renderer/script_context.cc
+++ b/extensions/renderer/script_context.cc
@@ -5,6 +5,7 @@
 #include "extensions/renderer/script_context.h"
 
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
diff --git a/extensions/renderer/script_context.h b/extensions/renderer/script_context.h
index c803b7b..b59a97f 100644
--- a/extensions/renderer/script_context.h
+++ b/extensions/renderer/script_context.h
@@ -9,9 +9,9 @@
 #include <utility>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/threading/thread_checker.h"
 #include "extensions/common/features/feature.h"
 #include "extensions/common/permissions/api_permission_set.h"
diff --git a/extensions/renderer/script_context_set.h b/extensions/renderer/script_context_set.h
index 68cbd3b..a435614 100644
--- a/extensions/renderer/script_context_set.h
+++ b/extensions/renderer/script_context_set.h
@@ -5,6 +5,8 @@
 #ifndef EXTENSIONS_RENDERER_SCRIPT_CONTEXT_SET_H_
 #define EXTENSIONS_RENDERER_SCRIPT_CONTEXT_SET_H_
 
+#include <stddef.h>
+
 #include <set>
 #include <string>
 
diff --git a/extensions/renderer/script_injection.cc b/extensions/renderer/script_injection.cc
index 876c07a..2ab3c04 100644
--- a/extensions/renderer/script_injection.cc
+++ b/extensions/renderer/script_injection.cc
@@ -8,6 +8,7 @@
 #include <utility>
 
 #include "base/lazy_instance.h"
+#include "base/macros.h"
 #include "base/metrics/histogram.h"
 #include "base/timer/elapsed_timer.h"
 #include "base/values.h"
@@ -36,10 +37,10 @@ using IsolatedWorldMap = std::map<std::string, int>;
 base::LazyInstance<IsolatedWorldMap> g_isolated_worlds =
     LAZY_INSTANCE_INITIALIZER;
 
-const int64 kInvalidRequestId = -1;
+const int64_t kInvalidRequestId = -1;
 
 // The id of the next pending injection.
-int64 g_next_pending_id = 0;
+int64_t g_next_pending_id = 0;
 
 // Gets the isolated world ID to use for the given |injection_host|
 // in the given |frame|. If no isolated world has been created for that
diff --git a/extensions/renderer/script_injection.h b/extensions/renderer/script_injection.h
index 0c7e186..6b36795 100644
--- a/extensions/renderer/script_injection.h
+++ b/extensions/renderer/script_injection.h
@@ -5,7 +5,8 @@
 #ifndef EXTENSIONS_RENDERER_SCRIPT_INJECTION_H_
 #define EXTENSIONS_RENDERER_SCRIPT_INJECTION_H_
 
-#include "base/basictypes.h"
+#include <stdint.h>
+
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
@@ -82,7 +83,7 @@ class ScriptInjection {
   // Accessors.
   content::RenderFrame* render_frame() const { return render_frame_; }
   const HostID& host_id() const { return injection_host_->id(); }
-  int64 request_id() const { return request_id_; }
+  int64_t request_id() const { return request_id_; }
 
  private:
   class FrameWatcher;
@@ -121,7 +122,7 @@ class ScriptInjection {
 
   // This injection's request id. This will be -1 unless the injection is
   // currently waiting on permission.
-  int64 request_id_;
+  int64_t request_id_;
 
   // Whether or not the injection is complete, either via injecting the script
   // or because it will never complete.
diff --git a/extensions/renderer/script_injection_manager.cc b/extensions/renderer/script_injection_manager.cc
index e2974af..8876707 100644
--- a/extensions/renderer/script_injection_manager.cc
+++ b/extensions/renderer/script_injection_manager.cc
@@ -81,7 +81,7 @@ class ScriptInjectionManager::RFOHelper : public content::RenderFrameObserver {
                                           const ExtensionId& extension_id,
                                           int script_id,
                                           const GURL& url);
-  virtual void OnPermitScriptInjection(int64 request_id);
+  virtual void OnPermitScriptInjection(int64_t request_id);
 
   // Tells the ScriptInjectionManager to run tasks associated with
   // document_idle.
@@ -196,7 +196,7 @@ void ScriptInjectionManager::RFOHelper::OnExecuteDeclarativeScript(
 }
 
 void ScriptInjectionManager::RFOHelper::OnPermitScriptInjection(
-    int64 request_id) {
+    int64_t request_id) {
   manager_->HandlePermitScriptInjection(request_id);
 }
 
@@ -448,7 +448,7 @@ void ScriptInjectionManager::HandleExecuteDeclarativeScript(
   }
 }
 
-void ScriptInjectionManager::HandlePermitScriptInjection(int64 request_id) {
+void ScriptInjectionManager::HandlePermitScriptInjection(int64_t request_id) {
   auto iter = pending_injections_.begin();
   for (; iter != pending_injections_.end(); ++iter) {
     if ((*iter)->request_id() == request_id) {
diff --git a/extensions/renderer/script_injection_manager.h b/extensions/renderer/script_injection_manager.h
index c85b4fe..c0f5da8 100644
--- a/extensions/renderer/script_injection_manager.h
+++ b/extensions/renderer/script_injection_manager.h
@@ -5,12 +5,15 @@
 #ifndef EXTENSIONS_RENDERER_SCRIPT_INJECTION_MANAGER_H_
 #define EXTENSIONS_RENDERER_SCRIPT_INJECTION_MANAGER_H_
 
+#include <stdint.h>
+
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
+#include "base/macros.h"
 #include "base/scoped_observer.h"
 #include "extensions/common/user_script.h"
 #include "extensions/renderer/script_injection.h"
@@ -90,7 +93,7 @@ class ScriptInjectionManager : public UserScriptSetManager::Observer {
                                       const GURL& url);
 
   // Handle the GrantInjectionPermission extension message.
-  void HandlePermitScriptInjection(int64 request_id);
+  void HandlePermitScriptInjection(int64_t request_id);
 
   // The map of active web frames to their corresponding statuses. The
   // RunLocation of the frame corresponds to the last location that has ran.
diff --git a/extensions/renderer/scripts_run_info.h b/extensions/renderer/scripts_run_info.h
index 0c08715..ebd51df 100644
--- a/extensions/renderer/scripts_run_info.h
+++ b/extensions/renderer/scripts_run_info.h
@@ -5,11 +5,12 @@
 #ifndef EXTENSIONS_RENDERER_SCRIPTS_RUN_INFO_H_
 #define EXTENSIONS_RENDERER_SCRIPTS_RUN_INFO_H_
 
+#include <stddef.h>
+
 #include <map>
 #include <set>
 #include <string>
 
-#include "base/basictypes.h"
 #include "base/macros.h"
 #include "base/timer/elapsed_timer.h"
 #include "extensions/common/user_script.h"
diff --git a/extensions/renderer/send_request_natives.cc b/extensions/renderer/send_request_natives.cc
index 995985e..5b1bfb4 100644
--- a/extensions/renderer/send_request_natives.cc
+++ b/extensions/renderer/send_request_natives.cc
@@ -4,6 +4,8 @@
 
 #include "extensions/renderer/send_request_natives.h"
 
+#include <stdint.h>
+
 #include "base/json/json_reader.h"
 #include "content/public/child/v8_value_converter.h"
 #include "extensions/renderer/request_sender.h"
diff --git a/extensions/renderer/send_request_natives.h b/extensions/renderer/send_request_natives.h
index 50b4f53..69212e1 100644
--- a/extensions/renderer/send_request_natives.h
+++ b/extensions/renderer/send_request_natives.h
@@ -5,6 +5,7 @@
 #ifndef EXTENSIONS_RENDERER_SEND_REQUEST_NATIVES_H_
 #define EXTENSIONS_RENDERER_SEND_REQUEST_NATIVES_H_
 
+#include "base/macros.h"
 #include "extensions/renderer/object_backed_native_handler.h"
 #include "v8/include/v8.h"
 
diff --git a/extensions/renderer/set_icon_natives.cc b/extensions/renderer/set_icon_natives.cc
index 744b4b4..426acfe 100644
--- a/extensions/renderer/set_icon_natives.cc
+++ b/extensions/renderer/set_icon_natives.cc
@@ -4,8 +4,12 @@
 
 #include "extensions/renderer/set_icon_natives.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <limits>
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/public/common/common_param_traits.h"
 #include "extensions/renderer/request_sender.h"
diff --git a/extensions/renderer/set_icon_natives.h b/extensions/renderer/set_icon_natives.h
index 5e71443..f425891 100644
--- a/extensions/renderer/set_icon_natives.h
+++ b/extensions/renderer/set_icon_natives.h
@@ -5,6 +5,7 @@
 #ifndef EXTENSIONS_RENDERER_SET_ICON_NATIVES_H_
 #define EXTENSIONS_RENDERER_SET_ICON_NATIVES_H_
 
+#include "base/macros.h"
 #include "extensions/renderer/object_backed_native_handler.h"
 #include "v8/include/v8.h"
 
diff --git a/extensions/renderer/static_v8_external_one_byte_string_resource.h b/extensions/renderer/static_v8_external_one_byte_string_resource.h
index 5ffba3a..3f56958 100644
--- a/extensions/renderer/static_v8_external_one_byte_string_resource.h
+++ b/extensions/renderer/static_v8_external_one_byte_string_resource.h
@@ -5,6 +5,8 @@
 #ifndef EXTENSIONS_RENDERER_STATIC_V8_EXTERNAL_ONE_BYTE_STRING_RESOURCE_H_
 #define EXTENSIONS_RENDERER_STATIC_V8_EXTERNAL_ONE_BYTE_STRING_RESOURCE_H_
 
+#include <stddef.h>
+
 #include "base/compiler_specific.h"
 #include "base/strings/string_piece.h"
 #include "v8/include/v8.h"
diff --git a/extensions/renderer/test_native_handler.h b/extensions/renderer/test_native_handler.h
index 057329d..88e5d23 100644
--- a/extensions/renderer/test_native_handler.h
+++ b/extensions/renderer/test_native_handler.h
@@ -6,6 +6,7 @@
 #define EXTENSIONS_RENDERER_TEST_NATIVE_HANDLER_H_
 
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "extensions/renderer/object_backed_native_handler.h"
 #include "v8/include/v8.h"
 
diff --git a/extensions/renderer/user_script_injector.h b/extensions/renderer/user_script_injector.h
index c98af0b..6190989 100644
--- a/extensions/renderer/user_script_injector.h
+++ b/extensions/renderer/user_script_injector.h
@@ -7,6 +7,7 @@
 
 #include <string>
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/scoped_observer.h"
 #include "extensions/common/user_script.h"
diff --git a/extensions/renderer/user_script_set.cc b/extensions/renderer/user_script_set.cc
index e4d5295..200f84c 100644
--- a/extensions/renderer/user_script_set.cc
+++ b/extensions/renderer/user_script_set.cc
@@ -4,6 +4,8 @@
 
 #include "extensions/renderer/user_script_set.h"
 
+#include <stddef.h>
+
 #include <utility>
 
 #include "base/memory/ref_counted.h"
diff --git a/extensions/renderer/user_script_set.h b/extensions/renderer/user_script_set.h
index 42d3190..128b33f 100644
--- a/extensions/renderer/user_script_set.h
+++ b/extensions/renderer/user_script_set.h
@@ -9,7 +9,6 @@
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
diff --git a/extensions/renderer/user_script_set_manager.h b/extensions/renderer/user_script_set_manager.h
index bf878fe..5cba81e 100644
--- a/extensions/renderer/user_script_set_manager.h
+++ b/extensions/renderer/user_script_set_manager.h
@@ -10,6 +10,7 @@
 #include <string>
 #include <vector>
 
+#include "base/macros.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/shared_memory.h"
 #include "base/observer_list.h"
diff --git a/extensions/renderer/utils_native_handler.cc b/extensions/renderer/utils_native_handler.cc
index 35b39eb..d93f2e6 100644
--- a/extensions/renderer/utils_native_handler.cc
+++ b/extensions/renderer/utils_native_handler.cc
@@ -4,6 +4,7 @@
 
 #include "extensions/renderer/utils_native_handler.h"
 
+#include "base/macros.h"
 #include "base/strings/stringprintf.h"
 #include "extensions/renderer/script_context.h"
 #include "third_party/WebKit/public/web/WebScopedMicrotaskSuppression.h"
diff --git a/extensions/renderer/utils_native_handler.h b/extensions/renderer/utils_native_handler.h
index 407fb6a..c69860f 100644
--- a/extensions/renderer/utils_native_handler.h
+++ b/extensions/renderer/utils_native_handler.h
@@ -5,6 +5,7 @@
 #ifndef EXTENSIONS_RENDERER_UTILS_NATIVE_HANDLER_H_
 #define EXTENSIONS_RENDERER_UTILS_NATIVE_HANDLER_H_
 
+#include "base/macros.h"
 #include "extensions/renderer/object_backed_native_handler.h"
 
 namespace extensions {
diff --git a/extensions/renderer/v8_helpers.h b/extensions/renderer/v8_helpers.h
index 0c9a47c..2a6fa9c 100644
--- a/extensions/renderer/v8_helpers.h
+++ b/extensions/renderer/v8_helpers.h
@@ -5,6 +5,7 @@
 #ifndef EXTENSIONS_RENDERER_V8_HELPERS_H_
 #define EXTENSIONS_RENDERER_V8_HELPERS_H_
 
+#include <stdint.h>
 #include <string.h>
 
 #include "base/strings/string_number_conversions.h"
diff --git a/extensions/renderer/v8_schema_registry.cc b/extensions/renderer/v8_schema_registry.cc
index e3dd34c..5c49be3 100644
--- a/extensions/renderer/v8_schema_registry.cc
+++ b/extensions/renderer/v8_schema_registry.cc
@@ -4,6 +4,8 @@
 
 #include "extensions/renderer/v8_schema_registry.h"
 
+#include <stddef.h>
+
 #include <utility>
 
 #include "base/logging.h"
diff --git a/extensions/renderer/v8_schema_registry.h b/extensions/renderer/v8_schema_registry.h
index 2368a6a..08f54b6 100644
--- a/extensions/renderer/v8_schema_registry.h
+++ b/extensions/renderer/v8_schema_registry.h
@@ -9,7 +9,7 @@
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "gin/public/context_holder.h"
 #include "v8/include/v8-util.h"
diff --git a/extensions/renderer/wake_event_page.cc b/extensions/renderer/wake_event_page.cc
index 6097075..e3e2189 100644
--- a/extensions/renderer/wake_event_page.cc
+++ b/extensions/renderer/wake_event_page.cc
@@ -11,6 +11,7 @@
 #include "base/bind_helpers.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/public/child/worker_thread.h"
 #include "content/public/renderer/render_thread.h"
diff --git a/extensions/renderer/web_ui_injection_host.h b/extensions/renderer/web_ui_injection_host.h
index 3019a81..a4df5f7 100644
--- a/extensions/renderer/web_ui_injection_host.h
+++ b/extensions/renderer/web_ui_injection_host.h
@@ -5,6 +5,7 @@
 #ifndef EXTENSIONS_RENDERER_WEBUI_INJECTION_HOST_H_
 #define EXTENSIONS_RENDERER_WEBUI_INJECTION_HOST_H_
 
+#include "base/macros.h"
 #include "extensions/renderer/injection_host.h"
 
 class WebUIInjectionHost : public InjectionHost {