Switch to standard integer types in ios/.

ios/web/public/user_agent.mm

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ios/web/public/user_agent.h"
 
 #import <UIKit/UIKit.h>
 
+#include <stddef.h>
+#include <stdint.h>
 #include <sys/sysctl.h>
 #include <string>
 
 #include "base/mac/scoped_nsobject.h"
+#include "base/macros.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/sys_info.h"
 
 namespace {
 
 struct UAVersions {
   const char* safari_version_string;
   const char* webkit_version_string;
 };
 
 struct OSVersionMap {
-  int32 major_os_version;
-  int32 minor_os_version;
+  int32_t major_os_version;
+  int32_t minor_os_version;
   UAVersions ua_versions;
 };
 
 const UAVersions& GetUAVersionsForCurrentOS() {
   // The WebKit version can be extracted dynamically from UIWebView, but the
   // Safari version can't be, so a lookup table is used instead (for both, since
   // the reported versions should stay in sync).
   static const OSVersionMap version_map[] = {
       {9, 0, {"601.1.46", "601.1"}},
       {8, 0, {"600.1.4", "600.1.4"}},
       {7, 1, {"9537.53", "537.51.2"}},
       {7, 0, {"9537.53", "537.51.1"}},
   };
 
-  int32 os_major_version = 0;
-  int32 os_minor_version = 0;
-  int32 os_bugfix_version = 0;
+  int32_t os_major_version = 0;
+  int32_t os_minor_version = 0;
+  int32_t os_bugfix_version = 0;
   base::SysInfo::OperatingSystemVersionNumbers(&os_major_version,
                                                &os_minor_version,
                                                &os_bugfix_version);
 
   // Return the versions corresponding to the first (and thus highest) OS
   // version less than or equal to the given OS version.
   for (unsigned int i = 0; i < arraysize(version_map); ++i) {
     if (os_major_version > version_map[i].major_os_version ||
         (os_major_version == version_map[i].major_os_version &&
          os_minor_version >= version_map[i].minor_os_version))
       return version_map[i].ua_versions;
   }
   NOTREACHED();
   return version_map[arraysize(version_map) - 1].ua_versions;
 }
 
 }  // namespace
 
 namespace web {
 
 std::string BuildOSCpuInfo() {
-  int32 os_major_version = 0;
-  int32 os_minor_version = 0;
-  int32 os_bugfix_version = 0;
+  int32_t os_major_version = 0;
+  int32_t os_minor_version = 0;
+  int32_t os_bugfix_version = 0;
   base::SysInfo::OperatingSystemVersionNumbers(&os_major_version,
                                                &os_minor_version,
                                                &os_bugfix_version);
   std::string os_version;
   if (os_bugfix_version == 0) {
     base::StringAppendF(&os_version,
                         "%d_%d",
                         os_major_version,
                         os_minor_version);
   } else {
@@ skipping 42 matching lines @@
                       BuildOSCpuInfo().c_str(),
                       ua_versions.webkit_version_string,
                       product.c_str(),
                       kernel_version,
                       ua_versions.safari_version_string);
 
   return user_agent;
 }
 
 }  // namespace web