Make ExternalDataUseReporter independent of other data use classes

chrome/browser/android/data_usage/external_data_use_observer.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/android/data_usage/external_data_use_observer.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/metrics/field_trial.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 45 matching lines @@
       // It is okay to use  base::Unretained for the callbacks, since
       // |external_data_use_observer_bridge_| is owned by |this|, and is
       // destroyed on UI thread after |this| and |data_use_tab_model_| are
       // destroyed.
       data_use_tab_model_(new DataUseTabModel(
           base::Bind(&ExternalDataUseObserverBridge::FetchMatchingRules,
                      base::Unretained(external_data_use_observer_bridge_)),
           base::Bind(
               &ExternalDataUseObserverBridge::ShouldRegisterAsDataUseObserver,
               base::Unretained(external_data_use_observer_bridge_)))),
-      external_data_use_reporter_(
-          new ExternalDataUseReporter(kExternalDataUseObserverFieldTrial,
-                                      data_use_tab_model_,
-                                      external_data_use_observer_bridge_)),
+      // It is okay to use  base::Unretained for the callbacks, since
+      // |external_data_use_observer_bridge_| and |data_use_tab_model_| are
+      // owned by |this|, and are destroyed on UI thread after |this| and
+      // |external_data_use_reporter_| are destroyed.
+      external_data_use_reporter_(new ExternalDataUseReporter(
+          kExternalDataUseObserverFieldTrial,
+          base::Bind(&DataUseTabModel::GetTrackingInfoForTabAtTime,
+                     base::Unretained(data_use_tab_model_)),
+          base::Bind(&ExternalDataUseObserverBridge::ReportDataUse,
+                     base::Unretained(external_data_use_observer_bridge_)))),
       ui_task_runner_(ui_task_runner),
       last_matching_rules_fetch_time_(base::TimeTicks::Now()),
       fetch_matching_rules_duration_(
           base::TimeDelta::FromSeconds(GetFetchMatchingRulesDurationSeconds())),
       registered_as_data_use_observer_(false),
       weak_factory_(this) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
   DCHECK(data_use_aggregator_);
   DCHECK(io_task_runner);
   DCHECK(ui_task_runner_);
@@ skipping 109 matching lines @@
 }
 
 DataUseTabModel* ExternalDataUseObserver::GetDataUseTabModel() const {
   DCHECK(thread_checker_.CalledOnValidThread());
   return data_use_tab_model_;
 }
 
 }  // namespace android
 
 }  // namespace chrome