Switch to standard integer types in gin/.

BUG=138542
TBR=aa@chromium.org
Switch to standard integer types in gin/.

BUG=138542
TBR=aa@chromium.org

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

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

38 files changed, 68 insertions, 21 deletions

diff --git a/gin/arguments.h b/gin/arguments.h
index b8d1296..55f9f44 100644
--- a/gin/arguments.h
+++ b/gin/arguments.h
@@ -5,7 +5,6 @@
 #ifndef GIN_ARGUMENTS_H_
 #define GIN_ARGUMENTS_H_
 
-#include "base/basictypes.h"
 #include "gin/converter.h"
 #include "gin/gin_export.h"
 
diff --git a/gin/array_buffer.cc b/gin/array_buffer.cc
index 9aad42e..d40e898 100644
--- a/gin/array_buffer.cc
+++ b/gin/array_buffer.cc
@@ -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 <stddef.h>
 #include <stdlib.h>
 
 #include "base/logging.h"
diff --git a/gin/array_buffer.h b/gin/array_buffer.h
index 4451540..2aef366 100644
--- a/gin/array_buffer.h
+++ b/gin/array_buffer.h
@@ -5,8 +5,11 @@
 #ifndef GIN_ARRAY_BUFFER_H_
 #define GIN_ARRAY_BUFFER_H_
 
-#include "base/basictypes.h"
+#include <stddef.h>
+#include <stdint.h>
+
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "gin/converter.h"
 #include "gin/gin_export.h"
diff --git a/gin/converter.cc b/gin/converter.cc
index 9a3462d..42fcd59 100644
--- a/gin/converter.cc
+++ b/gin/converter.cc
@@ -4,6 +4,8 @@
 
 #include "gin/converter.h"
 
+#include <stdint.h>
+
 #include "v8/include/v8.h"
 
 using v8::ArrayBuffer;
diff --git a/gin/converter.h b/gin/converter.h
index 12348e2..c15f87d 100644
--- a/gin/converter.h
+++ b/gin/converter.h
@@ -5,6 +5,8 @@
 #ifndef GIN_CONVERTER_H_
 #define GIN_CONVERTER_H_
 
+#include <stdint.h>
+
 #include <string>
 #include <vector>
 
diff --git a/gin/converter_unittest.cc b/gin/converter_unittest.cc
index 099895a..ec543c2 100644
--- a/gin/converter_unittest.cc
+++ b/gin/converter_unittest.cc
@@ -5,8 +5,9 @@
 #include "gin/converter.h"
 
 #include <limits.h>
+#include <stddef.h>
+#include <stdint.h>
 
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "gin/public/isolate_holder.h"
diff --git a/gin/function_template.h b/gin/function_template.h
index 15ea8fe..c0228cb 100644
--- a/gin/function_template.h
+++ b/gin/function_template.h
@@ -5,8 +5,11 @@
 #ifndef GIN_FUNCTION_TEMPLATE_H_
 #define GIN_FUNCTION_TEMPLATE_H_
 
+#include <stddef.h>
+
 #include "base/callback.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "gin/arguments.h"
 #include "gin/converter.h"
 #include "gin/gin_export.h"
diff --git a/gin/interceptor.cc b/gin/interceptor.cc
index 617fd08..6b7b812 100644
--- a/gin/interceptor.cc
+++ b/gin/interceptor.cc
@@ -4,6 +4,8 @@
 
 #include "gin/interceptor.h"
 
+#include <stdint.h>
+
 #include <map>
 
 #include "gin/per_isolate_data.h"
diff --git a/gin/interceptor.h b/gin/interceptor.h
index 43cb346..bd265fb 100644
--- a/gin/interceptor.h
+++ b/gin/interceptor.h
@@ -5,10 +5,12 @@
 #ifndef GIN_INTERCEPTOR_H_
 #define GIN_INTERCEPTOR_H_
 
+#include <stdint.h>
+
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "gin/gin_export.h"
 #include "v8/include/v8.h"
 
diff --git a/gin/interceptor_unittest.cc b/gin/interceptor_unittest.cc
index 02fb10d..59e75cf 100644
--- a/gin/interceptor_unittest.cc
+++ b/gin/interceptor_unittest.cc
@@ -2,7 +2,10 @@
 // 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/logging.h"
+#include "base/macros.h"
 #include "gin/arguments.h"
 #include "gin/handle.h"
 #include "gin/interceptor.h"
diff --git a/gin/isolate_holder.cc b/gin/isolate_holder.cc
index 59d6f06..45f689a 100644
--- a/gin/isolate_holder.cc
+++ b/gin/isolate_holder.cc
@@ -4,6 +4,7 @@
 
 #include "gin/public/isolate_holder.h"
 
+#include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/gin/modules/file_module_provider.cc b/gin/modules/file_module_provider.cc
index 1568378..a25686d 100644
--- a/gin/modules/file_module_provider.cc
+++ b/gin/modules/file_module_provider.cc
@@ -4,6 +4,8 @@
 
 #include "gin/modules/file_module_provider.h"
 
+#include <stddef.h>
+
 #include "base/bind.h"
 #include "base/files/file_util.h"
 #include "base/message_loop/message_loop.h"
diff --git a/gin/modules/file_module_provider.h b/gin/modules/file_module_provider.h
index dd75a0fe..7c03887 100644
--- a/gin/modules/file_module_provider.h
+++ b/gin/modules/file_module_provider.h
@@ -10,6 +10,7 @@
 #include <vector>
 
 #include "base/files/file_path.h"
+#include "base/macros.h"
 #include "gin/gin_export.h"
 #include "gin/runner.h"
 
diff --git a/gin/modules/module_registry.cc b/gin/modules/module_registry.cc
index b75894c..10d5464 100644
--- a/gin/modules/module_registry.cc
+++ b/gin/modules/module_registry.cc
@@ -4,6 +4,9 @@
 
 #include "gin/modules/module_registry.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <string>
 #include <vector>
 
diff --git a/gin/modules/module_registry.h b/gin/modules/module_registry.h
index a2e0d0b..0f67137a 100644
--- a/gin/modules/module_registry.h
+++ b/gin/modules/module_registry.h
@@ -12,6 +12,7 @@
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/observer_list.h"
diff --git a/gin/modules/module_registry_unittest.cc b/gin/modules/module_registry_unittest.cc
index 00c6a94..e337c2d 100644
--- a/gin/modules/module_registry_unittest.cc
+++ b/gin/modules/module_registry_unittest.cc
@@ -4,7 +4,10 @@
 
 #include "gin/modules/module_registry.h"
 
+#include <stdint.h>
+
 #include "base/bind.h"
+#include "base/macros.h"
 #include "gin/modules/module_registry_observer.h"
 #include "gin/modules/module_runner_delegate.h"
 #include "gin/public/context_holder.h"
diff --git a/gin/modules/module_runner_delegate.h b/gin/modules/module_runner_delegate.h
index 002db1c..f49594c 100644
--- a/gin/modules/module_runner_delegate.h
+++ b/gin/modules/module_runner_delegate.h
@@ -9,6 +9,7 @@
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "gin/gin_export.h"
 #include "gin/modules/file_module_provider.h"
 #include "gin/shell_runner.h"
diff --git a/gin/modules/timer.h b/gin/modules/timer.h
index c4f8091..1b7f613 100644
--- a/gin/modules/timer.h
+++ b/gin/modules/timer.h
@@ -5,6 +5,7 @@
 #ifndef GIN_MODULES_TIMER_H_
 #define GIN_MODULES_TIMER_H_
 
+#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/timer/timer.h"
 #include "gin/gin_export.h"
diff --git a/gin/object_template_builder.cc b/gin/object_template_builder.cc
index 28c9791..158131f 100644
--- a/gin/object_template_builder.cc
+++ b/gin/object_template_builder.cc
@@ -4,6 +4,8 @@
 
 #include "gin/object_template_builder.h"
 
+#include <stdint.h>
+
 #include "gin/interceptor.h"
 #include "gin/per_isolate_data.h"
 #include "gin/public/wrapper_info.h"
diff --git a/gin/per_context_data.h b/gin/per_context_data.h
index 976ef51..3931429 100644
--- a/gin/per_context_data.h
+++ b/gin/per_context_data.h
@@ -5,7 +5,7 @@
 #ifndef GIN_PER_CONTEXT_DATA_H_
 #define GIN_PER_CONTEXT_DATA_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/supports_user_data.h"
 #include "gin/gin_export.h"
 #include "v8/include/v8.h"
diff --git a/gin/per_isolate_data.h b/gin/per_isolate_data.h
index ef44f31..a1ef474 100644
--- a/gin/per_isolate_data.h
+++ b/gin/per_isolate_data.h
@@ -7,7 +7,7 @@
 
 #include <map>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "gin/gin_export.h"
diff --git a/gin/public/context_holder.h b/gin/public/context_holder.h
index 835bffa..176af17 100644
--- a/gin/public/context_holder.h
+++ b/gin/public/context_holder.h
@@ -7,7 +7,7 @@
 
 #include <list>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "gin/gin_export.h"
 #include "v8/include/v8.h"
diff --git a/gin/public/debug.h b/gin/public/debug.h
index 0c24109..14e3017 100644
--- a/gin/public/debug.h
+++ b/gin/public/debug.h
@@ -5,6 +5,8 @@
 #ifndef GIN_PUBLIC_DEBUG_H_
 #define GIN_PUBLIC_DEBUG_H_
 
+#include <stddef.h>
+
 #include "build/build_config.h"
 #include "gin/gin_export.h"
 #include "v8/include/v8.h"
diff --git a/gin/public/isolate_holder.h b/gin/public/isolate_holder.h
index 6ce302b..cb51c2f 100644
--- a/gin/public/isolate_holder.h
+++ b/gin/public/isolate_holder.h
@@ -5,7 +5,7 @@
 #ifndef GIN_PUBLIC_ISOLATE_HOLDER_H_
 #define GIN_PUBLIC_ISOLATE_HOLDER_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "gin/gin_export.h"
 #include "gin/public/v8_idle_task_runner.h"
diff --git a/gin/public/v8_idle_task_runner.h b/gin/public/v8_idle_task_runner.h
index f0662d1..a294166 100644
--- a/gin/public/v8_idle_task_runner.h
+++ b/gin/public/v8_idle_task_runner.h
@@ -5,7 +5,6 @@
 #ifndef GIN_PUBLIC_V8_IDLE_TASK_RUNNER_H_
 #define GIN_PUBLIC_V8_IDLE_TASK_RUNNER_H_
 
-#include "base/basictypes.h"
 #include "v8/include/v8-platform.h"
 
 namespace gin {
diff --git a/gin/public/v8_platform.h b/gin/public/v8_platform.h
index d66c1fb..3fe3485 100644
--- a/gin/public/v8_platform.h
+++ b/gin/public/v8_platform.h
@@ -5,9 +5,9 @@
 #ifndef GIN_PUBLIC_V8_PLATFORM_H_
 #define GIN_PUBLIC_V8_PLATFORM_H_
 
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/lazy_instance.h"
+#include "base/macros.h"
 #include "gin/gin_export.h"
 #include "v8/include/v8-platform.h"
 
diff --git a/gin/runner.h b/gin/runner.h
index 3199569..a898b03 100644
--- a/gin/runner.h
+++ b/gin/runner.h
@@ -7,6 +7,7 @@
 
 #include <string>
 
+#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "gin/gin_export.h"
 #include "gin/public/context_holder.h"
diff --git a/gin/shell/gin_main.cc b/gin/shell/gin_main.cc
index 299a69c..1fff9f5 100644
--- a/gin/shell/gin_main.cc
+++ b/gin/shell/gin_main.cc
@@ -7,6 +7,7 @@
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/i18n/icu_util.h"
+#include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "gin/array_buffer.h"
 #include "gin/modules/console.h"
diff --git a/gin/shell_runner.h b/gin/shell_runner.h
index e150feac..2d1cc49 100644
--- a/gin/shell_runner.h
+++ b/gin/shell_runner.h
@@ -5,6 +5,7 @@
 #ifndef GIN_SHELL_RUNNER_H_
 #define GIN_SHELL_RUNNER_H_
 
+#include "base/macros.h"
 #include "gin/runner.h"
 
 namespace gin {
diff --git a/gin/test/file_runner.h b/gin/test/file_runner.h
index 9f7ab4b..b20859a 100644
--- a/gin/test/file_runner.h
+++ b/gin/test/file_runner.h
@@ -7,6 +7,7 @@
 
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
+#include "base/macros.h"
 #include "gin/modules/module_runner_delegate.h"
 #include "gin/runner.h"
 
diff --git a/gin/test/v8_test.h b/gin/test/v8_test.h
index 592b889..3cb68d5 100644
--- a/gin/test/v8_test.h
+++ b/gin/test/v8_test.h
@@ -5,8 +5,8 @@
 #ifndef GIN_TEST_V8_TEST_H_
 #define GIN_TEST_V8_TEST_H_
 
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/gin/try_catch.h b/gin/try_catch.h
index 84b2ae1..a1daaf1 100644
--- a/gin/try_catch.h
+++ b/gin/try_catch.h
@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "gin/gin_export.h"
 #include "v8/include/v8.h"
 
diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc
index 5440b96..cfb3630 100644
--- a/gin/v8_initializer.cc
+++ b/gin/v8_initializer.cc
@@ -4,7 +4,9 @@
 
 #include "gin/v8_initializer.h"
 
-#include "base/basictypes.h"
+#include <stddef.h>
+#include <stdint.h>
+
 #include "base/debug/alias.h"
 #include "base/files/file.h"
 #include "base/files/file_path.h"
@@ -286,8 +288,8 @@ void V8Initializer::LoadV8Natives() {
 
 // static
 void V8Initializer::LoadV8SnapshotFromFD(base::PlatformFile snapshot_pf,
-                                         int64 snapshot_offset,
-                                         int64 snapshot_size) {
+                                         int64_t snapshot_offset,
+                                         int64_t snapshot_size) {
   if (g_mapped_snapshot)
     return;
 
@@ -318,8 +320,8 @@ void V8Initializer::LoadV8SnapshotFromFD(base::PlatformFile snapshot_pf,
 
 // static
 void V8Initializer::LoadV8NativesFromFD(base::PlatformFile natives_pf,
-                                        int64 natives_offset,
-                                        int64 natives_size) {
+                                        int64_t natives_offset,
+                                        int64_t natives_size) {
   if (g_mapped_natives)
     return;
 
diff --git a/gin/v8_initializer.h b/gin/v8_initializer.h
index fcf2d2a..dcb5329 100644
--- a/gin/v8_initializer.h
+++ b/gin/v8_initializer.h
@@ -5,6 +5,8 @@
 #ifndef GIN_V8_INITIALIZER_H_
 #define GIN_V8_INITIALIZER_H_
 
+#include <stdint.h>
+
 #include "base/files/file.h"
 #include "base/files/memory_mapped_file.h"
 #include "gin/array_buffer.h"
@@ -36,14 +38,14 @@ class GIN_EXPORT V8Initializer {
   // of the files to be loaded. Since the VM can boot with or without
   // the snapshot, this function does not return a status.
   static void LoadV8SnapshotFromFD(base::PlatformFile snapshot_fd,
-                                   int64 snapshot_offset,
-                                   int64 snapshot_size);
+                                   int64_t snapshot_offset,
+                                   int64_t snapshot_size);
   // Similar to LoadV8SnapshotFromFD, but for the source of the natives.
   // Without the natives we cannot continue, so this function contains
   // release mode asserts and won't return if it fails.
   static void LoadV8NativesFromFD(base::PlatformFile natives_fd,
-                                  int64 natives_offset,
-                                  int64 natives_size);
+                                  int64_t natives_offset,
+                                  int64_t natives_size);
 
   // Load V8 snapshot from default resources, if they are available.
   static void LoadV8Snapshot();
diff --git a/gin/v8_isolate_memory_dump_provider.cc b/gin/v8_isolate_memory_dump_provider.cc
index 55e6c50..ec2e33b 100644
--- a/gin/v8_isolate_memory_dump_provider.cc
+++ b/gin/v8_isolate_memory_dump_provider.cc
@@ -4,6 +4,8 @@
 
 #include "gin/v8_isolate_memory_dump_provider.h"
 
+#include <stddef.h>
+
 #include "base/strings/stringprintf.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/trace_event/memory_dump_manager.h"
diff --git a/gin/v8_isolate_memory_dump_provider.h b/gin/v8_isolate_memory_dump_provider.h
index 2a2c5db..d70b790 100644
--- a/gin/v8_isolate_memory_dump_provider.h
+++ b/gin/v8_isolate_memory_dump_provider.h
@@ -7,6 +7,7 @@
 
 #include <string>
 
+#include "base/macros.h"
 #include "base/trace_event/memory_dump_provider.h"
 #include "gin/gin_export.h"
 
diff --git a/gin/wrappable.h b/gin/wrappable.h
index e6c7a71..f253fd9 100644
--- a/gin/wrappable.h
+++ b/gin/wrappable.h
@@ -7,6 +7,7 @@
 
 #include <type_traits>
 
+#include "base/macros.h"
 #include "base/template_util.h"
 #include "gin/converter.h"
 #include "gin/gin_export.h"
diff --git a/gin/wrappable_unittest.cc b/gin/wrappable_unittest.cc
index 07d4fb3..e773d2d 100644
--- a/gin/wrappable_unittest.cc
+++ b/gin/wrappable_unittest.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/logging.h"
+#include "base/macros.h"
 #include "gin/arguments.h"
 #include "gin/handle.h"
 #include "gin/object_template_builder.h"