| Index: components/metrics/metrics_service.cc
|
| diff --git a/components/metrics/metrics_service.cc b/components/metrics/metrics_service.cc
|
| index 54e4deb73c6a2f5af67a2139d72af6869bd5a4e3..86d946aba5d58099dde47f3a341b32ff7b5b3152 100644
|
| --- a/components/metrics/metrics_service.cc
|
| +++ b/components/metrics/metrics_service.cc
|
| @@ -341,7 +341,12 @@ void MetricsService::InitializeMetricsRecordingState() {
|
| base::Bind(&MetricsService::StartScheduledUpload,
|
| self_ptr_factory_.GetWeakPtr());
|
| scheduler_.reset(
|
| - new MetricsReportingScheduler(upload_callback, is_cellular_callback_));
|
| + new MetricsReportingScheduler(
|
| + upload_callback,
|
| + // MetricsServiceClient outlives MetricsService, and
|
| + // MetricsReportingScheduler is tied to the lifetime of |this|.
|
| + base::Bind(&MetricsServiceClient::GetStandardUploadInterval,
|
| + base::Unretained(client_))));
|
| }
|
|
|
| void MetricsService::Start() {
|
| @@ -1224,10 +1229,4 @@ void MetricsService::RecordCurrentState(PrefService* pref) {
|
| base::Time::Now().ToTimeT());
|
| }
|
|
|
| -void MetricsService::SetConnectionTypeCallback(
|
| - base::Callback<void(bool*)> is_cellular_callback) {
|
| - DCHECK(!scheduler_);
|
| - is_cellular_callback_ = is_cellular_callback;
|
| -}
|
| -
|
| } // namespace metrics
|
|
|