Switch to standard integer types in chromeos/.

chromeos/network/network_util.cc

 // Copyright (c) 2012 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 "chromeos/network/network_util.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_tokenizer.h"
 #include "base/strings/string_util.h"
 #include "chromeos/login/login_state.h"
 #include "chromeos/network/device_state.h"
 #include "chromeos/network/managed_network_configuration_handler.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "chromeos/network/network_ui_data.h"
 #include "chromeos/network/onc/onc_signature.h"
@@ skipping 13 matching lines @@
 }
 
 CellularScanResult::CellularScanResult() {
 }
 
 CellularScanResult::~CellularScanResult() {
 }
 
 namespace network_util {
 
-std::string PrefixLengthToNetmask(int32 prefix_length) {
+std::string PrefixLengthToNetmask(int32_t prefix_length) {
   std::string netmask;
   // Return the empty string for invalid inputs.
   if (prefix_length < 0 || prefix_length > 32)
     return netmask;
   for (int i = 0; i < 4; i++) {
     int remainder = 8;
     if (prefix_length >= 8) {
       prefix_length -= 8;
     } else {
       remainder = prefix_length;
       prefix_length = 0;
     }
     if (i > 0)
       netmask += ".";
     int value = remainder == 0 ? 0 :
         ((2L << (remainder - 1)) - 1) << (8 - remainder);
     netmask += base::IntToString(value);
   }
   return netmask;
 }
 
-int32 NetmaskToPrefixLength(const std::string& netmask) {
+int32_t NetmaskToPrefixLength(const std::string& netmask) {
   int count = 0;
   int prefix_length = 0;
   base::StringTokenizer t(netmask, ".");
   while (t.GetNext()) {
     // If there are more than 4 numbers, then it's invalid.
     if (count == 4)
       return -1;
 
     std::string token = t.token();
     // If we already found the last mask and the current one is not
@@ skipping 139 matching lines @@
 std::string TranslateShillTypeToONC(const std::string& shill_type) {
   if (shill_type == shill::kTypeEthernet)
     return ::onc::network_type::kEthernet;
   std::string onc_type;
   onc::TranslateStringToONC(onc::kNetworkTypeTable, shill_type, &onc_type);
   return onc_type;
 }
 
 }  // namespace network_util
 }  // namespace chromeos