Switch to standard integer types in remoting/.

BUG=138542
TBR=wez@chromium.org

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

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

9 files changed, 15 insertions, 7 deletions

diff --git a/remoting/client/jni/android_keymap.cc b/remoting/client/jni/android_keymap.cc
index 7f5653e..2fc44b8 100644
--- a/remoting/client/jni/android_keymap.cc
+++ b/remoting/client/jni/android_keymap.cc
@@ -12,7 +12,7 @@ namespace {
 // <android/keycodes.h> and
 // "ui/events/keycodes/keyboard_code_conversion_android.cc" . Some of these
 // mappings assume a US keyboard layout for now.
-const uint32 usb_keycodes[] = {
+const uint32_t usb_keycodes[] = {
   0,         // UNKNOWN
   0,         // SOFT_LEFT
   0,         // SOFT_RIGHT
@@ -203,8 +203,8 @@ const uint32 usb_keycodes[] = {
 
 namespace remoting {
 
-uint32 AndroidKeycodeToUsbKeycode(size_t android) {
-  if (android >= sizeof (usb_keycodes) / sizeof (uint32)) {
+uint32_t AndroidKeycodeToUsbKeycode(size_t android) {
+  if (android >= sizeof(usb_keycodes) / sizeof(uint32_t)) {
     LOG(WARNING) << "Attempted to decode out-of-range Android keycode";
     return 0;
   }
diff --git a/remoting/client/jni/android_keymap.h b/remoting/client/jni/android_keymap.h
index 9368ae5..5cfe555 100644
--- a/remoting/client/jni/android_keymap.h
+++ b/remoting/client/jni/android_keymap.h
@@ -5,7 +5,9 @@
 #ifndef REMOTING_CLIENT_JNI_ANDROID_KEYMAP_H_
 #define REMOTING_CLIENT_JNI_ANDROID_KEYMAP_H_
 
-#include "base/basictypes.h"
+#include <stddef.h>
+#include <stdint.h>
+
 #include "base/memory/scoped_ptr.h"
 
 namespace remoting {
@@ -16,7 +18,7 @@ namespace remoting {
 // instead of the host's. The whole process needs to be rethought to accomplish
 // the mappings in a localizable and future-proof way.
 // crbug.com/265945
-uint32 AndroidKeycodeToUsbKeycode(size_t android);
+uint32_t AndroidKeycodeToUsbKeycode(size_t android);
 
 }  // namespace remoting
 
diff --git a/remoting/client/jni/chromoting_jni_instance.cc b/remoting/client/jni/chromoting_jni_instance.cc
index 535ca0f..02a701f 100644
--- a/remoting/client/jni/chromoting_jni_instance.cc
+++ b/remoting/client/jni/chromoting_jni_instance.cc
@@ -5,6 +5,7 @@
 #include "remoting/client/jni/chromoting_jni_instance.h"
 
 #include <android/log.h>
+#include <stdint.h>
 
 #include "base/bind.h"
 #include "base/logging.h"
diff --git a/remoting/client/jni/chromoting_jni_instance.h b/remoting/client/jni/chromoting_jni_instance.h
index c8ff15f..89e2bd2 100644
--- a/remoting/client/jni/chromoting_jni_instance.h
+++ b/remoting/client/jni/chromoting_jni_instance.h
@@ -7,6 +7,7 @@
 
 #include <string>
 
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
diff --git a/remoting/client/jni/chromoting_jni_runtime.cc b/remoting/client/jni/chromoting_jni_runtime.cc
index 335e1ff..36b423c 100644
--- a/remoting/client/jni/chromoting_jni_runtime.cc
+++ b/remoting/client/jni/chromoting_jni_runtime.cc
@@ -9,7 +9,6 @@
 #include "base/android/jni_string.h"
 #include "base/android/library_loader/library_loader_hooks.h"
 #include "base/android/scoped_java_ref.h"
-#include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/memory/singleton.h"
 #include "base/stl_util.h"
diff --git a/remoting/client/jni/chromoting_jni_runtime.h b/remoting/client/jni/chromoting_jni_runtime.h
index 5d622ac..d2d5e46 100644
--- a/remoting/client/jni/chromoting_jni_runtime.h
+++ b/remoting/client/jni/chromoting_jni_runtime.h
@@ -9,6 +9,7 @@
 #include <string>
 
 #include "base/android/scoped_java_ref.h"
+#include "base/macros.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "remoting/base/auto_thread.h"
 #include "remoting/client/jni/chromoting_jni_instance.h"
diff --git a/remoting/client/jni/jni_frame_consumer.cc b/remoting/client/jni/jni_frame_consumer.cc
index 8c84dba..25923da 100644
--- a/remoting/client/jni/jni_frame_consumer.cc
+++ b/remoting/client/jni/jni_frame_consumer.cc
@@ -4,6 +4,8 @@
 
 #include "remoting/client/jni/jni_frame_consumer.h"
 
+#include <stdint.h>
+
 #include "base/android/jni_android.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/logging.h"
@@ -67,7 +69,7 @@ void JniFrameConsumer::Renderer::RenderFrame(
   // and then the R/B channels are swapped in place (on the decoding thread).
   // If a repaint is triggered from a Java event handler, the unswapped pixels
   // can sometimes appear on the display.
-  uint8* dest_buffer = static_cast<uint8*>(bitmap_->pixels());
+  uint8_t* dest_buffer = static_cast<uint8_t*>(bitmap_->pixels());
   webrtc::DesktopRect buffer_rect =
       webrtc::DesktopRect::MakeSize(frame->size());
   for (webrtc::DesktopRegion::Iterator i(frame->updated_region()); !i.IsAtEnd();
diff --git a/remoting/client/jni/jni_frame_consumer.h b/remoting/client/jni/jni_frame_consumer.h
index 5a9f7e6..5c72e9b 100644
--- a/remoting/client/jni/jni_frame_consumer.h
+++ b/remoting/client/jni/jni_frame_consumer.h
@@ -8,6 +8,7 @@
 #include <list>
 
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "remoting/client/frame_consumer.h"
diff --git a/remoting/client/jni/remoting_jni_onload.cc b/remoting/client/jni/remoting_jni_onload.cc
index b539747..2140e4a 100644
--- a/remoting/client/jni/remoting_jni_onload.cc
+++ b/remoting/client/jni/remoting_jni_onload.cc
@@ -8,6 +8,7 @@
 #include "base/android/jni_registrar.h"
 #include "base/android/jni_utils.h"
 #include "base/bind.h"
+#include "base/macros.h"
 #include "net/android/net_jni_registrar.h"
 #include "remoting/client/jni/remoting_jni_registrar.h"
 #include "ui/gfx/android/gfx_jni_registrar.h"