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

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

Issue 893003002: Data Reduction Proxy class ownership updates and Settings cleanup (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 10 months 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_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..2b50efa7334526e8775c08361b039437ab9b2e93 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
@@ -12,6 +12,7 @@
#include "base/single_thread_task_runner.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/browser/data_saver_service.h"
#include "components/data_reduction_proxy/core/common/data_reduction_proxy_headers.h"
#include "components/data_reduction_proxy/core/common/data_reduction_proxy_params.h"
#include "net/base/load_flags.h"
@@ -104,10 +105,10 @@ void DataReductionProxyUsageStats::DetectAndRecordMissingViaHeaderResponseCode(
DataReductionProxyUsageStats::DataReductionProxyUsageStats(
DataReductionProxyParams* params,
- DataReductionProxySettings* settings,
+ base::WeakPtr<DataSaverService> 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(

Powered by Google App Engine
This is Rietveld 408576698