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 <[email protected]>
Tested-by: Ben Chan <[email protected]>
Commit-Queue: Ben Chan <[email protected]>
diff --git a/update_attempter_unittest.cc b/update_attempter_unittest.cc
index 43897aa..632c297 100644
--- a/update_attempter_unittest.cc
+++ b/update_attempter_unittest.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <stdint.h>
+
#include <base/file_util.h>
#include <gtest/gtest.h>
#include <policy/libpolicy.h>
@@ -893,7 +895,7 @@
// Tests that the scatter_factor_in_seconds value is properly fetched
// from the device policy.
void UpdateAttempterTest::ReadScatterFactorFromPolicyTestStart() {
- int64 scatter_factor_in_seconds = 36000;
+ int64_t scatter_factor_in_seconds = 36000;
policy::MockDevicePolicy* device_policy = new policy::MockDevicePolicy();
attempter_.policy_provider_.reset(new policy::PolicyProvider(device_policy));
@@ -923,7 +925,7 @@
void UpdateAttempterTest::DecrementUpdateCheckCountTestStart() {
// Tests that the scatter_factor_in_seconds value is properly fetched
// from the device policy and is decremented if value > 0.
- int64 initial_value = 5;
+ int64_t initial_value = 5;
Prefs prefs;
attempter_.prefs_ = &prefs;
@@ -938,7 +940,7 @@
<< "Failed to initialize preferences.";
EXPECT_TRUE(prefs.SetInt64(kPrefsUpdateCheckCount, initial_value));
- int64 scatter_factor_in_seconds = 10;
+ int64_t scatter_factor_in_seconds = 10;
policy::MockDevicePolicy* device_policy = new policy::MockDevicePolicy();
attempter_.policy_provider_.reset(new policy::PolicyProvider(device_policy));
@@ -957,7 +959,7 @@
// Make sure the file still exists.
EXPECT_TRUE(prefs.Exists(kPrefsUpdateCheckCount));
- int64 new_value;
+ int64_t new_value;
EXPECT_TRUE(prefs.GetInt64(kPrefsUpdateCheckCount, &new_value));
EXPECT_EQ(initial_value - 1, new_value);
@@ -986,7 +988,7 @@
void UpdateAttempterTest::NoScatteringDoneDuringManualUpdateTestStart() {
// Tests that no scattering logic is enabled if the update check
// is manually done (as opposed to a scheduled update check)
- int64 initial_value = 8;
+ int64_t initial_value = 8;
Prefs prefs;
attempter_.prefs_ = &prefs;
@@ -1004,7 +1006,7 @@
// make sure scatter_factor is non-zero as scattering is disabled
// otherwise.
- int64 scatter_factor_in_seconds = 50;
+ int64_t scatter_factor_in_seconds = 50;
policy::MockDevicePolicy* device_policy = new policy::MockDevicePolicy();
attempter_.policy_provider_.reset(new policy::PolicyProvider(device_policy));
