Make DataUseTabModel and DataUseMatcher more independent

chrome/browser/android/data_usage/data_use_matcher_unittest.cc

Index: chrome/browser/android/data_usage/data_use_matcher_unittest.cc
diff --git a/chrome/browser/android/data_usage/data_use_matcher_unittest.cc b/chrome/browser/android/data_usage/data_use_matcher_unittest.cc
index aac25942d6499f06e68e92975ebd1d733fea0e0b..d67b2f7d06012c27997b2cd83633a1285e63a9a6 100644
--- a/chrome/browser/android/data_usage/data_use_matcher_unittest.cc
+++ b/chrome/browser/android/data_usage/data_use_matcher_unittest.cc
@@ -10,12 +10,14 @@
 #include <string>
 #include <vector>
 
+#include "base/bind.h"
 #include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/test/histogram_tester.h"
 #include "base/time/tick_clock.h"
 #include "base/time/time.h"
+#include "chrome/browser/android/data_usage/data_use_tab_model.h"
 #include "chrome/browser/android/data_usage/external_data_use_observer_bridge.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/test_browser_thread_bundle.h"
@@ -78,10 +80,14 @@ class DataUseMatcherTest : public testing::Test {
       : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP),
         external_data_use_observer_bridge_(
             new TestExternalDataUseObserverBridge()),
-        data_use_matcher_(base::WeakPtr<DataUseTabModel>(),
-                          external_data_use_observer_bridge_.get(),
-                          base::TimeDelta::FromSeconds(
-                              kDefaultMatchingRuleExpirationDurationSeconds)) {}
+        data_use_matcher_(
+            base::Bind(&DataUseTabModel::OnTrackingLabelRemoved,
+                       base::WeakPtr<DataUseTabModel>()),
+            base::Bind(
+                &ExternalDataUseObserverBridge::ShouldRegisterAsDataUseObserver,
+                base::Unretained(external_data_use_observer_bridge_.get())),

[tbansal1, 2016/07/19 17:59:32]

include base/bind_helpers for base::Unretained. Here, and everywhere else in
this CL.

[Raj, 2016/07/19 21:29:08]

Done.

+            base::TimeDelta::FromSeconds(
+                kDefaultMatchingRuleExpirationDurationSeconds)) {}
 
   DataUseMatcher* data_use_matcher() { return &data_use_matcher_; }