| Index: components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.cc
|
| diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.cc
|
| index 26b3a7e4512574551e57d20127429679e7509231..838689ecc9b184ace8d3a325e7fb0e52cfb816ae 100644
|
| --- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.cc
|
| +++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.cc
|
| @@ -11,10 +11,10 @@
|
| #include "base/prefs/pref_service.h"
|
| #include "base/strings/string_number_conversions.h"
|
| #include "base/values.h"
|
| +#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.h"
|
| #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_config.h"
|
| #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.h"
|
| #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_service.h"
|
| -#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_statistics_prefs.h"
|
| #include "components/data_reduction_proxy/core/common/data_reduction_proxy_params.h"
|
| #include "components/data_reduction_proxy/core/common/data_reduction_proxy_pref_names.h"
|
| #include "components/data_reduction_proxy/core/common/data_reduction_proxy_switches.h"
|
| @@ -166,9 +166,9 @@ void DataReductionProxySettings::SetDataReductionProxyAlternativeEnabled(
|
|
|
| int64 DataReductionProxySettings::GetDataReductionLastUpdateTime() {
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
| - DCHECK(data_reduction_proxy_service_->statistics_prefs());
|
| + DCHECK(data_reduction_proxy_service_->compression_stats());
|
| int64 last_update_internal =
|
| - data_reduction_proxy_service_->statistics_prefs()->GetInt64(
|
| + data_reduction_proxy_service_->compression_stats()->GetInt64(
|
| prefs::kDailyHttpContentLengthLastUpdateDate);
|
| base::Time last_update = base::Time::FromInternalValue(last_update_internal);
|
| return static_cast<int64>(last_update.ToJsTime());
|
| @@ -236,12 +236,12 @@ void DataReductionProxySettings::OnProxyAlternativeEnabledPrefChange() {
|
|
|
| void DataReductionProxySettings::ResetDataReductionStatistics() {
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
| - DCHECK(data_reduction_proxy_service_->statistics_prefs());
|
| + DCHECK(data_reduction_proxy_service_->compression_stats());
|
| base::ListValue* original_update =
|
| - data_reduction_proxy_service_->statistics_prefs()->GetList(
|
| + data_reduction_proxy_service_->compression_stats()->GetList(
|
| prefs::kDailyHttpOriginalContentLength);
|
| base::ListValue* received_update =
|
| - data_reduction_proxy_service_->statistics_prefs()->GetList(
|
| + data_reduction_proxy_service_->compression_stats()->GetList(
|
| prefs::kDailyHttpReceivedContentLength);
|
| original_update->Clear();
|
| received_update->Clear();
|
| @@ -296,9 +296,9 @@ DataReductionProxySettings::ContentLengthList
|
| DataReductionProxySettings::GetDailyContentLengths(const char* pref_name) {
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
| DataReductionProxySettings::ContentLengthList content_lengths;
|
| - DCHECK(data_reduction_proxy_service_->statistics_prefs());
|
| + DCHECK(data_reduction_proxy_service_->compression_stats());
|
| const base::ListValue* list_value =
|
| - data_reduction_proxy_service_->statistics_prefs()->GetList(pref_name);
|
| + data_reduction_proxy_service_->compression_stats()->GetList(pref_name);
|
| if (list_value->GetSize() == kNumDaysInHistory) {
|
| for (size_t i = 0; i < kNumDaysInHistory; ++i) {
|
| content_lengths.push_back(GetInt64PrefValue(*list_value, i));
|
| @@ -314,13 +314,13 @@ void DataReductionProxySettings::GetContentLengths(
|
| int64* last_update_time) {
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
| DCHECK_LE(days, kNumDaysInHistory);
|
| - DCHECK(data_reduction_proxy_service_->statistics_prefs());
|
| + DCHECK(data_reduction_proxy_service_->compression_stats());
|
|
|
| const base::ListValue* original_list =
|
| - data_reduction_proxy_service_->statistics_prefs()->GetList(
|
| + data_reduction_proxy_service_->compression_stats()->GetList(
|
| prefs::kDailyHttpOriginalContentLength);
|
| const base::ListValue* received_list =
|
| - data_reduction_proxy_service_->statistics_prefs()->GetList(
|
| + data_reduction_proxy_service_->compression_stats()->GetList(
|
| prefs::kDailyHttpReceivedContentLength);
|
|
|
| if (original_list->GetSize() != kNumDaysInHistory ||
|
| @@ -342,7 +342,7 @@ void DataReductionProxySettings::GetContentLengths(
|
| *original_content_length = orig;
|
| *received_content_length = recv;
|
| *last_update_time =
|
| - data_reduction_proxy_service_->statistics_prefs()->GetInt64(
|
| + data_reduction_proxy_service_->compression_stats()->GetInt64(
|
| prefs::kDailyHttpContentLengthLastUpdateDate);
|
| }
|
|
|
|
|