commit 7fab89734d88724a288e96a9996b15548c5294c7
author Ben Chan <benchan@chromium.org> Sun Aug 10 17:14:46 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Mon Aug 11 05:37:57 2014 +0000
tree ec3fa83e9f1b0bb8647e94890f7b963b653c6215
parent 73dd0dcf5a44ee14eac2de389c9ba967a449a20d

shill: Use integer types from stdint.h

This CL replaces the deprecated int* and uint* types from
'base/basictypes.h' with the int*_t and uint*_t types from 'stdint.h'.

BUG=chromium:401356
TEST=`USE='cellular gdmwimax wimax' FEATURES=test emerge-$BOARD platform2`

Change-Id: I3d4c195881203dd2a47dbb5af150b6c90b9c206e
Reviewed-on: https://chromium-review.googlesource.com/211770
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Ben Chan <benchan@chromium.org>
Tested-by: Ben Chan <benchan@chromium.org>

routing_table_unittest.cc

diff --git a/routing_table_unittest.cc b/routing_table_unittest.cc
index 950dd34..81b063c 100644
--- a/routing_table_unittest.cc
+++ b/routing_table_unittest.cc
@@ -67,13 +67,13 @@
   }
 
   void SendRouteEntry(RTNLMessage::Mode mode,
-                      uint32 interface_index,
+                      uint32_t interface_index,
                       const RoutingTableEntry &entry);
 
   void SendRouteEntryWithSeqAndProto(RTNLMessage::Mode mode,
-                                     uint32 interface_index,
+                                     uint32_t interface_index,
                                      const RoutingTableEntry &entry,
-                                     uint32 seq,
+                                     uint32_t seq,
                                      unsigned char proto);
 
   void SendRouteMessage(const RTNLMessage &msg);
@@ -84,8 +84,8 @@
   }
 
  protected:
-  static const uint32 kTestDeviceIndex0;
-  static const uint32 kTestDeviceIndex1;
+  static const uint32_t kTestDeviceIndex0;
+  static const uint32_t kTestDeviceIndex1;
   static const char kTestDeviceName0[];
   static const char kTestDeviceNetAddress4[];
   static const char kTestForeignNetAddress4[];
@@ -99,7 +99,7 @@
   static const char kTestRemoteNetmask4[];
   static const char kTestRemoteNetwork4[];
   static const int kTestRemotePrefix4;
-  static const uint32 kTestRequestSeq;
+  static const uint32_t kTestRequestSeq;
   static const int kTestRouteTag;
 
   class QueryCallbackTarget {
@@ -137,8 +137,8 @@
   StrictMock<MockRTNLHandler> rtnl_handler_;
 };
 
-const uint32 RoutingTableTest::kTestDeviceIndex0 = 12345;
-const uint32 RoutingTableTest::kTestDeviceIndex1 = 67890;
+const uint32_t RoutingTableTest::kTestDeviceIndex0 = 12345;
+const uint32_t RoutingTableTest::kTestDeviceIndex1 = 67890;
 const char RoutingTableTest::kTestDeviceName0[] = "test-device0";
 const char RoutingTableTest::kTestDeviceNetAddress4[] = "192.168.2.0/24";
 const char RoutingTableTest::kTestForeignNetAddress4[] = "192.168.2.2";
@@ -152,7 +152,7 @@
 const char RoutingTableTest::kTestRemoteNetmask4[] = "255.255.255.0";
 const char RoutingTableTest::kTestRemoteNetwork4[] = "192.168.100.0";
 const int RoutingTableTest::kTestRemotePrefix4 = 24;
-const uint32 RoutingTableTest::kTestRequestSeq = 456;
+const uint32_t RoutingTableTest::kTestRequestSeq = 456;
 const int RoutingTableTest::kTestRouteTag = 789;
 
 namespace {
@@ -160,8 +160,8 @@
 MATCHER_P3(IsBlackholeRoutingPacket, index, family, metric, "") {
   const RTNLMessage::RouteStatus &status = arg->route_status();
 
-  uint32 oif;
-  uint32 priority;
+  uint32_t oif;
+  uint32_t priority;
 
   return
       arg->type() == RTNLMessage::kTypeRoute &&
@@ -183,8 +183,8 @@
 MATCHER_P4(IsRoutingPacket, mode, index, entry, flags, "") {
   const RTNLMessage::RouteStatus &status = arg->route_status();
 
-  uint32 oif;
-  uint32 priority;
+  uint32_t oif;
+  uint32_t priority;
 
   return
       arg->type() == RTNLMessage::kTypeRoute &&
@@ -214,16 +214,16 @@
 }  // namespace
 
 void RoutingTableTest::SendRouteEntry(RTNLMessage::Mode mode,
-                                      uint32 interface_index,
+                                      uint32_t interface_index,
                                       const RoutingTableEntry &entry) {
   SendRouteEntryWithSeqAndProto(mode, interface_index, entry, 0, RTPROT_BOOT);
 }
 
 void RoutingTableTest::SendRouteEntryWithSeqAndProto(
     RTNLMessage::Mode mode,
-    uint32 interface_index,
+    uint32_t interface_index,
     const RoutingTableEntry &entry,
-    uint32 seq,
+    uint32_t seq,
     unsigned char proto) {
   RTNLMessage msg(
       RTNLMessage::kTypeRoute,
@@ -541,7 +541,7 @@
 MATCHER_P2(IsRoutingQuery, destination, index, "") {
   const RTNLMessage::RouteStatus &status = arg->route_status();
 
-  uint32 oif;
+  uint32_t oif;
 
   return
       arg->type() == RTNLMessage::kTypeRoute &&
@@ -798,7 +798,7 @@
 }
 
 TEST_F(RoutingTableTest, CreateBlackholeRoute) {
-  const uint32 kMetric = 2;
+  const uint32_t kMetric = 2;
   EXPECT_CALL(rtnl_handler_,
               SendMessage(IsBlackholeRoutingPacket(kTestDeviceIndex0,
                                                    IPAddress::kFamilyIPv6,