Index: components/data_reduction_proxy/core/browser/data_reduction_proxy_network_delegate_unittest.cc |
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_network_delegate_unittest.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_network_delegate_unittest.cc |
index 3232d5512a44852c0af6116d84afff81f5fe75ee..e07efe781c21bf9b61f58638fd0883f789862f7a 100644 |
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_network_delegate_unittest.cc |
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_network_delegate_unittest.cc |
@@ -4,16 +4,19 @@ |
#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_network_delegate.h" |
+#include <stddef.h> |
#include <stdint.h> |
#include <string> |
#include "base/command_line.h" |
+#include "base/macros.h" |
#include "base/metrics/field_trial.h" |
#include "base/strings/string_number_conversions.h" |
#include "base/test/histogram_tester.h" |
#include "base/test/mock_entropy_provider.h" |
#include "base/time/time.h" |
+#include "build/build_config.h" |
#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_bypass_stats.h" |
#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_config_test_utils.h" |
#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_metrics.h" |
@@ -162,11 +165,11 @@ class DataReductionProxyNetworkDelegateTest : public testing::Test { |
test_context_->settings()->WasLoFiModeActiveOnMainFrame()); |
} |
- int64 total_received_bytes() { |
+ int64_t total_received_bytes() { |
return data_reduction_proxy_network_delegate_->total_received_bytes_; |
} |
- int64 total_original_received_bytes() { |
+ int64_t total_original_received_bytes() { |
return data_reduction_proxy_network_delegate_ |
->total_original_received_bytes_; |
} |
@@ -412,8 +415,8 @@ TEST_F(DataReductionProxyNetworkDelegateTest, NetHistograms) { |
"Net.HttpContentLengthCacheable4Hours"; |
const std::string kCacheable24HoursHistogramName = |
"Net.HttpContentLengthCacheable24Hours"; |
- const int64 kResponseContentLength = 100; |
- const int64 kOriginalContentLength = 200; |
+ const int64_t kResponseContentLength = 100; |
+ const int64_t kOriginalContentLength = 200; |
base::HistogramTester histogram_tester; |
@@ -648,8 +651,8 @@ TEST_F(DataReductionProxyNetworkDelegateTest, NullRequest) { |
} |
TEST_F(DataReductionProxyNetworkDelegateTest, OnCompletedInternal) { |
- const int64 kResponseContentLength = 140; |
- const int64 kOriginalContentLength = 200; |
+ const int64_t kResponseContentLength = 140; |
+ const int64_t kOriginalContentLength = 200; |
set_network_delegate(data_reduction_proxy_network_delegate_.get()); |