Switch to standard integer types in base/.

BUG=138542
TBR=mark@chromium.org
NOPRESUBMIT=true

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

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

8 files changed, 17 insertions, 9 deletions

diff --git a/base/ios/crb_protocol_observers.mm b/base/ios/crb_protocol_observers.mm
index 4302fd4..8c4172a 100644
--- a/base/ios/crb_protocol_observers.mm
+++ b/base/ios/crb_protocol_observers.mm
@@ -5,6 +5,7 @@
 #import "base/ios/crb_protocol_observers.h"
 
 #include <objc/runtime.h>
+#include <stddef.h>
 #include <algorithm>
 #include <vector>
 
diff --git a/base/ios/device_util.h b/base/ios/device_util.h
index 1cd9a04..b1bed5c 100644
--- a/base/ios/device_util.h
+++ b/base/ios/device_util.h
@@ -5,6 +5,8 @@
 #ifndef BASE_IOS_DEVICE_UTIL_H_
 #define BASE_IOS_DEVICE_UTIL_H_
 
+#include <stdint.h>
+
 #include <string>
 
 namespace ios {
diff --git a/base/ios/device_util.mm b/base/ios/device_util.mm
index 4af8234..44e7c6c 100644
--- a/base/ios/device_util.mm
+++ b/base/ios/device_util.mm
@@ -9,6 +9,7 @@
 
 #include <ifaddrs.h>
 #include <net/if_dl.h>
+#include <stddef.h>
 #include <string.h>
 #include <sys/socket.h>
 #include <sys/sysctl.h>
diff --git a/base/ios/ios_util.h b/base/ios/ios_util.h
index 9f65339..e677adc 100644
--- a/base/ios/ios_util.h
+++ b/base/ios/ios_util.h
@@ -5,8 +5,9 @@
 #ifndef BASE_IOS_IOS_UTIL_H_
 #define BASE_IOS_IOS_UTIL_H_
 
+#include <stdint.h>
+
 #include "base/base_export.h"
-#include "base/basictypes.h"
 
 namespace base {
 namespace ios {
@@ -18,7 +19,9 @@ BASE_EXPORT bool IsRunningOnIOS8OrLater();
 BASE_EXPORT bool IsRunningOnIOS9OrLater();
 
 // Returns whether the operating system is at the given version or later.
-BASE_EXPORT bool IsRunningOnOrLater(int32 major, int32 minor, int32 bug_fix);
+BASE_EXPORT bool IsRunningOnOrLater(int32_t major,
+                                    int32_t minor,
+                                    int32_t bug_fix);
 
 // Returns whether iOS is signalling that an RTL text direction should be used
 // regardless of the current locale. This should not return true if the current
diff --git a/base/ios/ios_util.mm b/base/ios/ios_util.mm
index 554a202..627fb40 100644
--- a/base/ios/ios_util.mm
+++ b/base/ios/ios_util.mm
@@ -5,14 +5,16 @@
 #include "base/ios/ios_util.h"
 
 #import <Foundation/Foundation.h>
+#include <stddef.h>
 
+#include "base/macros.h"
 #include "base/sys_info.h"
 
 namespace {
 // Return a 3 elements array containing the major, minor and bug fix version of
 // the OS.
-const int32* OSVersionAsArray() {
-  int32* digits = new int32[3];
+const int32_t* OSVersionAsArray() {
+  int32_t* digits = new int32_t[3];
   base::SysInfo::OperatingSystemVersionNumbers(
       &digits[0], &digits[1], &digits[2]);
   return digits;
@@ -31,9 +33,9 @@ bool IsRunningOnIOS9OrLater() {
   return IsRunningOnOrLater(9, 0, 0);
 }
 
-bool IsRunningOnOrLater(int32 major, int32 minor, int32 bug_fix) {
-  static const int32* current_version = OSVersionAsArray();
-  int32 version[] = { major, minor, bug_fix };
+bool IsRunningOnOrLater(int32_t major, int32_t minor, int32_t bug_fix) {
+  static const int32_t* current_version = OSVersionAsArray();
+  int32_t version[] = {major, minor, bug_fix};
   for (size_t i = 0; i < arraysize(version); i++) {
     if (current_version[i] != version[i])
       return current_version[i] > version[i];
diff --git a/base/ios/scoped_critical_action.h b/base/ios/scoped_critical_action.h
index 803d587..61c471e 100644
--- a/base/ios/scoped_critical_action.h
+++ b/base/ios/scoped_critical_action.h
@@ -5,6 +5,7 @@
 #ifndef BASE_IOS_SCOPED_CRITICAL_ACTION_H_
 #define BASE_IOS_SCOPED_CRITICAL_ACTION_H_
 
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/lock.h"
 
diff --git a/base/ios/weak_nsobject.h b/base/ios/weak_nsobject.h
index fc3a7c3..136e430 100644
--- a/base/ios/weak_nsobject.h
+++ b/base/ios/weak_nsobject.h
@@ -8,7 +8,6 @@
 #import <Foundation/Foundation.h>
 #import <objc/runtime.h>
 
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
diff --git a/base/ios/weak_nsobject_unittest.mm b/base/ios/weak_nsobject_unittest.mm
index 81de993..f7abfa1 100644
--- a/base/ios/weak_nsobject_unittest.mm
+++ b/base/ios/weak_nsobject_unittest.mm
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/ios/weak_nsobject.h"
 #include "base/mac/scoped_nsobject.h"