Switch to standard integer types in chromeos/.

chromeos/network/network_util.h

 // 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.
 
 #ifndef CHROMEOS_NETWORK_NETWORK_UTIL_H_
 #define CHROMEOS_NETWORK_NETWORK_UTIL_H_
 
 // This header is introduced to make it easy to switch from chromeos_network.cc
 // to Chrome's own DBus code.  crosbug.com/16557
 // All calls to functions in chromeos_network.h should be made through
 // functions provided by this header.
 
+#include <stdint.h>
+
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "chromeos/chromeos_export.h"
 
 namespace base {
 class ListValue;
 }
 
@@ skipping 41 matching lines @@
 typedef base::Callback<void(
     const std::string& path,
     NetworkMethodErrorType error,
     const std::string& error_message)> NetworkOperationCallback;
 
 namespace network_util {
 
 // Converts a |prefix_length| to a netmask. (for IPv4 only)
 // e.g. a |prefix_length| of 24 is converted to a netmask of "255.255.255.0".
 // Invalid prefix lengths will return the empty string.
-CHROMEOS_EXPORT std::string PrefixLengthToNetmask(int32 prefix_length);
+CHROMEOS_EXPORT std::string PrefixLengthToNetmask(int32_t prefix_length);
 
 // Converts a |netmask| to a prefixlen. (for IPv4 only)
 // e.g. a |netmask| of 255.255.255.0 is converted to a prefixlen of 24
-CHROMEOS_EXPORT int32 NetmaskToPrefixLength(const std::string& netmask);
+CHROMEOS_EXPORT int32_t NetmaskToPrefixLength(const std::string& netmask);
 
 // Returns |shill_mac_address| in aa:bb format.
 CHROMEOS_EXPORT std::string FormattedMacAddress(
     const std::string& shill_mac_address);
 
 // Parses |list|, which contains DictionaryValues and returns a vector of
 // CellularScanResult in |scan_results|. Returns false if parsing fails,
 // in which case the contents of |scan_results| will be undefined.
 CHROMEOS_EXPORT bool ParseCellularScanResults(
     const base::ListValue& list, std::vector<CellularScanResult>* scan_results);
@@ skipping 19 matching lines @@
 // there is no match. Only valid for ethernet, wifi, wimax, cellular, and vpn.
 CHROMEOS_EXPORT std::string TranslateONCTypeToShill(const std::string& type);
 
 // Inverse of TranslateONCTypeToShill.
 CHROMEOS_EXPORT std::string TranslateShillTypeToONC(const std::string& type);
 
 }  // namespace network_util
 }  // namespace chromeos
 
 #endif  // CHROMEOS_NETWORK_NETWORK_UTIL_H_