| Index: components/data_reduction_proxy/core/browser/data_reduction_proxy_usage_stats.cc
|
| diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_usage_stats.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_usage_stats.cc
|
| index ef14fbd7a12869e598ef92fd16aa2c042dd5d0eb..4fb9547c1b9fd33a8f2f8cd223fa5db7fb9388bc 100644
|
| --- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_usage_stats.cc
|
| +++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_usage_stats.cc
|
| @@ -10,6 +10,7 @@
|
| #include "base/metrics/sparse_histogram.h"
|
| #include "base/prefs/pref_member.h"
|
| #include "base/single_thread_task_runner.h"
|
| +#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_service.h"
|
| #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.h"
|
| #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_tamper_detection.h"
|
| #include "components/data_reduction_proxy/core/common/data_reduction_proxy_headers.h"
|
| @@ -104,10 +105,10 @@ void DataReductionProxyUsageStats::DetectAndRecordMissingViaHeaderResponseCode(
|
|
|
| DataReductionProxyUsageStats::DataReductionProxyUsageStats(
|
| DataReductionProxyParams* params,
|
| - DataReductionProxySettings* settings,
|
| + base::WeakPtr<DataReductionProxyService> service,
|
| const scoped_refptr<base::SingleThreadTaskRunner>& ui_task_runner)
|
| : data_reduction_proxy_params_(params),
|
| - settings_(settings),
|
| + service_(service),
|
| last_bypass_type_(BYPASS_EVENT_TYPE_MAX),
|
| triggering_request_(true),
|
| ui_task_runner_(ui_task_runner),
|
| @@ -115,7 +116,6 @@ DataReductionProxyUsageStats::DataReductionProxyUsageStats(
|
| proxy_net_errors_count_(0),
|
| unavailable_(false) {
|
| DCHECK(params);
|
| - DCHECK(settings);
|
| NetworkChangeNotifier::AddNetworkChangeObserver(this);
|
| };
|
|
|
| @@ -386,7 +386,8 @@ void DataReductionProxyUsageStats::NotifyUnavailabilityIfChanged() {
|
| void DataReductionProxyUsageStats::NotifyUnavailabilityOnUIThread(
|
| bool unavailable) {
|
| DCHECK(ui_task_runner_->BelongsToCurrentThread());
|
| - settings_->SetUnreachable(unavailable);
|
| + if (service_)
|
| + service_->settings()->SetUnreachable(unavailable);
|
| }
|
|
|
| void DataReductionProxyUsageStats::RecordBypassedBytes(
|
|
|