commit 9abb763fa3840d69cc1098c0233162557a7f99ea
author Ben Chan <benchan@chromium.org> Thu Aug 07 00:10:53 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Thu Aug 07 14:25:13 2014 +0000
tree 110e9711a1005fb3ddcf2aba114983508b612705
parent 6339785dd4561d6c80ded02077c5217b57f55689

update_engine: 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=`FEATURES=test emerge-$BOARD update_engine`

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

omaha_request_action_unittest.cc

diff --git a/omaha_request_action_unittest.cc b/omaha_request_action_unittest.cc
index d210879..8036f46 100644
--- a/omaha_request_action_unittest.cc
+++ b/omaha_request_action_unittest.cc
@@ -2,11 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <glib.h>
+#include <stdint.h>
+
 #include <string>
 #include <vector>
 
-#include <glib.h>
-
 #include <base/strings/string_util.h>
 #include <base/strings/stringprintf.h>
 #include <base/time/time.h>
@@ -741,7 +742,7 @@
                       &response,
                       NULL));
 
-  int64 count;
+  int64_t count;
   ASSERT_TRUE(prefs.GetInt64(kPrefsUpdateCheckCount, &count));
   ASSERT_EQ(count, 0);
   EXPECT_TRUE(response.update_exists);
@@ -795,7 +796,7 @@
                       &response,
                       NULL));
 
-  int64 count;
+  int64_t count;
   ASSERT_TRUE(prefs.GetInt64(kPrefsUpdateCheckCount, &count));
   ASSERT_GT(count, 0);
   EXPECT_FALSE(response.update_exists);
@@ -883,7 +884,7 @@
                       &response,
                       NULL));
 
-  int64 count;
+  int64_t count;
   ASSERT_TRUE(prefs.GetInt64(kPrefsUpdateCheckCount, &count));
   // count remains the same, as the decrementing happens in update_attempter
   // which this test doesn't exercise.
@@ -1252,7 +1253,7 @@
                                         "file.signed",  // file name
                                         "HASH1234=",  // checksum
                                         "false",  // needs admin
-                                        // overflows int32:
+                                        // overflows int32_t:
                                         "123123123123123",  // size
                                         "deadline"),
                       -1,
@@ -1937,7 +1938,7 @@
                       &response,
                       NULL));
 
-  int64 timestamp = 0;
+  int64_t timestamp = 0;
   ASSERT_TRUE(prefs.GetInt64(kPrefsUpdateFirstSeenAt, &timestamp));
   ASSERT_GT(timestamp, 0);
   EXPECT_FALSE(response.update_exists);
@@ -2028,7 +2029,7 @@
   EXPECT_TRUE(response.update_exists);
 
   // Make sure the timestamp t1 is unchanged showing that it was reused.
-  int64 timestamp = 0;
+  int64_t timestamp = 0;
   ASSERT_TRUE(prefs.GetInt64(kPrefsUpdateFirstSeenAt, &timestamp));
   ASSERT_TRUE(timestamp == t1.ToInternalValue());
 }