Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2329)

Unified Diff: chrome/browser/policy/cloud/cloud_policy_invalidator.cc

Issue 1548133002: Switch to standard integer types in chrome/browser/, part 3 of 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/policy/cloud/cloud_policy_invalidator.cc
diff --git a/chrome/browser/policy/cloud/cloud_policy_invalidator.cc b/chrome/browser/policy/cloud/cloud_policy_invalidator.cc
index 0947a248b96190a158cc3f048936f26cc6f1f181..97bf3e021e6ed5a6c2a1b1b79cf78decccf7b3f7 100644
--- a/chrome/browser/policy/cloud/cloud_policy_invalidator.cc
+++ b/chrome/browser/policy/cloud/cloud_policy_invalidator.cc
@@ -35,7 +35,7 @@ CloudPolicyInvalidator::CloudPolicyInvalidator(
CloudPolicyCore* core,
const scoped_refptr<base::SequencedTaskRunner>& task_runner,
scoped_ptr<base::Clock> clock,
- int64 highest_handled_invalidation_version)
+ int64_t highest_handled_invalidation_version)
: state_(UNINITIALIZED),
type_(type),
core_(core),
@@ -167,7 +167,7 @@ void CloudPolicyInvalidator::OnStoreLoaded(CloudPolicyStore* store) {
METRIC_POLICY_REFRESH_SIZE);
}
- const int64 store_invalidation_version = store->invalidation_version();
+ const int64_t store_invalidation_version = store->invalidation_version();
// If the policy was invalid and the version stored matches the latest
// invalidation version, acknowledge the latest invalidation.
@@ -212,7 +212,7 @@ void CloudPolicyInvalidator::HandleInvalidation(
// numbers based on the number of such invalidations received. This
// ensures that the version numbers do not collide with "real" versions
// (which are positive) or previous invalidations with unknown version.
- int64 version;
+ int64_t version;
std::string payload;
if (invalidation.is_unknown_version()) {
version = -(++unknown_version_invalidation_count_);
@@ -380,7 +380,7 @@ bool CloudPolicyInvalidator::IsPolicyChanged(
const enterprise_management::PolicyData* policy) {
// Determine if the policy changed by comparing its hash value to the
// previous policy's hash value.
- uint32 new_hash_value = 0;
+ uint32_t new_hash_value = 0;
if (policy && policy->has_policy_value())
new_hash_value = base::Hash(policy->policy_value());
bool changed = new_hash_value != policy_hash_value_;
@@ -388,7 +388,7 @@ bool CloudPolicyInvalidator::IsPolicyChanged(
return changed;
}
-bool CloudPolicyInvalidator::IsInvalidationExpired(int64 version) {
+bool CloudPolicyInvalidator::IsInvalidationExpired(int64_t version) {
base::Time last_fetch_time = base::Time::UnixEpoch() +
base::TimeDelta::FromMilliseconds(core_->store()->policy()->timestamp());

Powered by Google App Engine
This is Rietveld 408576698