Switch to standard integer types in content/public/.

BUG=138542
TBR=jam@chromium.org

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

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

14 files changed, 28 insertions, 15 deletions

diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h
index 59d448c..fd2f3af 100644
--- a/content/public/renderer/content_renderer_client.h
+++ b/content/public/renderer/content_renderer_client.h
@@ -5,6 +5,8 @@
 #ifndef CONTENT_PUBLIC_RENDERER_CONTENT_RENDERER_CLIENT_H_
 #define CONTENT_PUBLIC_RENDERER_CONTENT_RENDERER_CLIENT_H_
 
+#include <stddef.h>
+
 #include <map>
 #include <string>
 #include <vector>
diff --git a/content/public/renderer/context_menu_client.h b/content/public/renderer/context_menu_client.h
index ceb10a0..1ae9d62 100644
--- a/content/public/renderer/context_menu_client.h
+++ b/content/public/renderer/context_menu_client.h
@@ -5,7 +5,6 @@
 #ifndef CONTENT_PUBLIC_RENDERER_CONTEXT_MENU_CLIENT_H_
 #define CONTENT_PUBLIC_RENDERER_CONTEXT_MENU_CLIENT_H_
 
-#include "base/basictypes.h"
 #include "content/common/content_export.h"
 
 namespace content {
diff --git a/content/public/renderer/media_stream_audio_sink.h b/content/public/renderer/media_stream_audio_sink.h
index 862c32b..3722b0e 100644
--- a/content/public/renderer/media_stream_audio_sink.h
+++ b/content/public/renderer/media_stream_audio_sink.h
@@ -7,7 +7,6 @@
 
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/time/time.h"
 #include "content/common/content_export.h"
 #include "content/public/renderer/media_stream_sink.h"
diff --git a/content/public/renderer/pepper_plugin_instance.h b/content/public/renderer/pepper_plugin_instance.h
index d397fbc..bd00e5b 100644
--- a/content/public/renderer/pepper_plugin_instance.h
+++ b/content/public/renderer/pepper_plugin_instance.h
@@ -5,7 +5,8 @@
 #ifndef CONTENT_PUBLIC_RENDERER_PEPPER_PLUGIN_INSTANCE_H_
 #define CONTENT_PUBLIC_RENDERER_PEPPER_PLUGIN_INSTANCE_H_
 
-#include "base/basictypes.h"
+#include <stdint.h>
+
 #include "base/process/process_handle.h"
 #include "base/strings/string16.h"
 #include "content/common/content_export.h"
diff --git a/content/public/renderer/platform_event_observer.h b/content/public/renderer/platform_event_observer.h
index 083007c..a7d296c 100644
--- a/content/public/renderer/platform_event_observer.h
+++ b/content/public/renderer/platform_event_observer.h
@@ -6,6 +6,7 @@
 #define CONTENT_PUBLIC_RENDERER_PLATFORM_EVENT_OBSERVER_H_
 
 #include "base/logging.h"
+#include "base/macros.h"
 #include "content/public/renderer/render_process_observer.h"
 #include "content/public/renderer/render_thread.h"
 
diff --git a/content/public/renderer/render_frame.h b/content/public/renderer/render_frame.h
index dc055ef..3450931 100644
--- a/content/public/renderer/render_frame.h
+++ b/content/public/renderer/render_frame.h
@@ -5,6 +5,8 @@
 #ifndef CONTENT_PUBLIC_RENDERER_RENDER_FRAME_H_
 #define CONTENT_PUBLIC_RENDERER_RENDER_FRAME_H_
 
+#include <stddef.h>
+
 #include "base/callback_forward.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
diff --git a/content/public/renderer/render_frame_observer.h b/content/public/renderer/render_frame_observer.h
index d59d41d..43182a6 100644
--- a/content/public/renderer/render_frame_observer.h
+++ b/content/public/renderer/render_frame_observer.h
@@ -5,8 +5,10 @@
 #ifndef CONTENT_PUBLIC_RENDERER_RENDER_FRAME_OBSERVER_H_
 #define CONTENT_PUBLIC_RENDERER_RENDER_FRAME_OBSERVER_H_
 
-#include "base/basictypes.h"
+#include <stdint.h>
+
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/strings/string16.h"
 #include "content/common/content_export.h"
 #include "ipc/ipc_listener.h"
@@ -94,8 +96,8 @@ class CONTENT_EXPORT RenderFrameObserver : public IPC::Listener,
   virtual void DetailedConsoleMessageAdded(const base::string16& message,
                                            const base::string16& source,
                                            const base::string16& stack_trace,
-                                           int32 line_number,
-                                           int32 severity_level) {}
+                                           int32_t line_number,
+                                           int32_t severity_level) {}
 
   // Called when an interesting (from document lifecycle perspective),
   // compositor-driven layout had happened. This is a reasonable hook to use
diff --git a/content/public/renderer/render_frame_observer_tracker.h b/content/public/renderer/render_frame_observer_tracker.h
index 70b296f..563a5c2 100644
--- a/content/public/renderer/render_frame_observer_tracker.h
+++ b/content/public/renderer/render_frame_observer_tracker.h
@@ -29,6 +29,7 @@
 #include <map>
 
 #include "base/lazy_instance.h"
+#include "base/macros.h"
 
 namespace content {
 
diff --git a/content/public/renderer/render_process_observer.h b/content/public/renderer/render_process_observer.h
index 582a60f..f53ba65 100644
--- a/content/public/renderer/render_process_observer.h
+++ b/content/public/renderer/render_process_observer.h
@@ -5,7 +5,7 @@
 #ifndef CONTENT_PUBLIC_RENDERER_RENDER_PROCESS_OBSERVER_H_
 #define CONTENT_PUBLIC_RENDERER_RENDER_PROCESS_OBSERVER_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "content/common/content_export.h"
 
 namespace IPC {
diff --git a/content/public/renderer/render_thread.h b/content/public/renderer/render_thread.h
index 929dd097..76cb48f 100644
--- a/content/public/renderer/render_thread.h
+++ b/content/public/renderer/render_thread.h
@@ -5,7 +5,9 @@
 #ifndef CONTENT_PUBLIC_RENDERER_RENDER_THREAD_H_
 #define CONTENT_PUBLIC_RENDERER_RENDER_THREAD_H_
 
-#include "base/basictypes.h"
+#include <stddef.h>
+#include <stdint.h>
+
 #include "base/callback.h"
 #include "base/memory/shared_memory.h"
 #include "base/metrics/user_metrics_action.h"
@@ -57,8 +59,8 @@ class CONTENT_EXPORT RenderThread : virtual public ChildThread {
 
   // Called to add or remove a listener for a particular message routing ID.
   // These methods normally get delegated to a MessageRouter.
-  virtual void AddRoute(int32 routing_id, IPC::Listener* listener) = 0;
-  virtual void RemoveRoute(int32 routing_id) = 0;
+  virtual void AddRoute(int32_t routing_id, IPC::Listener* listener) = 0;
+  virtual void RemoveRoute(int32_t routing_id) = 0;
   virtual int GenerateRoutingID() = 0;
 
   // These map to IPC::ChannelProxy methods.
@@ -107,15 +109,15 @@ class CONTENT_EXPORT RenderThread : virtual public ChildThread {
   virtual void RegisterExtension(v8::Extension* extension) = 0;
 
   // Schedule a call to IdleHandler with the given initial delay.
-  virtual void ScheduleIdleHandler(int64 initial_delay_ms) = 0;
+  virtual void ScheduleIdleHandler(int64_t initial_delay_ms) = 0;
 
   // A task we invoke periodically to assist with idle cleanup.
   virtual void IdleHandler() = 0;
 
   // Get/Set the delay for how often the idle handler is called.
-  virtual int64 GetIdleNotificationDelayInMs() const = 0;
+  virtual int64_t GetIdleNotificationDelayInMs() const = 0;
   virtual void SetIdleNotificationDelayInMs(
-      int64 idle_notification_delay_in_ms) = 0;
+      int64_t idle_notification_delay_in_ms) = 0;
 
   virtual void UpdateHistograms(int sequence_number) = 0;
 
diff --git a/content/public/renderer/render_view.h b/content/public/renderer/render_view.h
index 6ddf867..baa051f 100644
--- a/content/public/renderer/render_view.h
+++ b/content/public/renderer/render_view.h
@@ -5,10 +5,12 @@
 #ifndef CONTENT_PUBLIC_RENDERER_RENDER_VIEW_H_
 #define CONTENT_PUBLIC_RENDERER_RENDER_VIEW_H_
 
+#include <stddef.h>
+
 #include <string>
 
-#include "base/basictypes.h"
 #include "base/strings/string16.h"
+#include "build/build_config.h"
 #include "content/common/content_export.h"
 #include "content/public/common/top_controls_state.h"
 #include "ipc/ipc_sender.h"
diff --git a/content/public/renderer/render_view_observer.h b/content/public/renderer/render_view_observer.h
index 0fcf959..5eeb45b 100644
--- a/content/public/renderer/render_view_observer.h
+++ b/content/public/renderer/render_view_observer.h
@@ -5,8 +5,8 @@
 #ifndef CONTENT_PUBLIC_RENDERER_RENDER_VIEW_OBSERVER_H_
 #define CONTENT_PUBLIC_RENDERER_RENDER_VIEW_OBSERVER_H_
 
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "content/common/content_export.h"
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_sender.h"
diff --git a/content/public/renderer/render_view_observer_tracker.h b/content/public/renderer/render_view_observer_tracker.h
index 0ef3016..a05ed94 100644
--- a/content/public/renderer/render_view_observer_tracker.h
+++ b/content/public/renderer/render_view_observer_tracker.h
@@ -29,6 +29,7 @@
 #include <map>
 
 #include "base/lazy_instance.h"
+#include "base/macros.h"
 
 namespace content {
 
diff --git a/content/public/renderer/renderer_gamepad_provider.h b/content/public/renderer/renderer_gamepad_provider.h
index f51586d..b3b4ce3 100644
--- a/content/public/renderer/renderer_gamepad_provider.h
+++ b/content/public/renderer/renderer_gamepad_provider.h
@@ -5,6 +5,7 @@
 #ifndef CONTENT_PUBLIC_RENDERER_RENDERER_GAMEPAD_PROVIDER_H_
 #define CONTENT_PUBLIC_RENDERER_RENDERER_GAMEPAD_PROVIDER_H_
 
+#include "base/macros.h"
 #include "content/public/renderer/platform_event_observer.h"
 
 namespace blink {