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

Unified Diff: components/data_reduction_proxy/core/browser/data_reduction_proxy_request_options.cc

Issue 1546143002: Switch to standard integer types in components/, part 1 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: components/data_reduction_proxy/core/browser/data_reduction_proxy_request_options.cc
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_request_options.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_request_options.cc
index c96cf91d87895411e72c4da2ff0671b28917f31f..3ff319a39c489bf888627c62d2949b4ce2eaefce 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_request_options.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_request_options.cc
@@ -16,6 +16,7 @@
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "base/time/time.h"
+#include "build/build_config.h"
#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_config.h"
#include "components/data_reduction_proxy/core/common/data_reduction_proxy_client_config_parser.h"
#include "components/data_reduction_proxy/core/common/data_reduction_proxy_headers.h"
@@ -151,7 +152,7 @@ void DataReductionProxyRequestOptions::UpdateExperiments() {
// static
base::string16 DataReductionProxyRequestOptions::AuthHashForSalt(
- int64 salt,
+ int64_t salt,
const std::string& key) {
std::string salted_key =
base::StringPrintf("%lld%s%lld",
@@ -212,10 +213,9 @@ void DataReductionProxyRequestOptions::ComputeCredentials(
std::string* credentials) const {
DCHECK(session);
DCHECK(credentials);
- int64 timestamp =
- (now - base::Time::UnixEpoch()).InMilliseconds() / 1000;
+ int64_t timestamp = (now - base::Time::UnixEpoch()).InMilliseconds() / 1000;
- int32 rand[3];
+ int32_t rand[3];
RandBytes(rand, 3 * sizeof(rand[0]));
*session = base::StringPrintf("%lld-%u-%u-%u",
static_cast<long long>(timestamp),

Powered by Google App Engine
This is Rietveld 408576698