Make DataUseTabModel and DataUseMatcher more independent

chrome/browser/android/data_usage/data_use_matcher_unittest.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/data_use_matcher.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #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"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
 namespace {
 
 const char kUMAMatchingRulesCountValidHistogram[] =
     "DataUsage.MatchingRulesCount.Valid";
@@ skipping 42 matching lines @@
 namespace android {
 
 class ExternalDataUseObserver;
 
 class DataUseMatcherTest : public testing::Test {
  public:
   DataUseMatcherTest()
       : 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_; }
 
   void RegisterURLRegexes(const std::vector<std::string>& app_package_name,
                           const std::vector<std::string>& domain_path_regex,
                           const std::vector<std::string>& label) {
     data_use_matcher_.RegisterURLRegexes(app_package_name, domain_path_regex,
                                          label);
   }
 
@@ skipping 447 matching lines @@
                             base::TimeDelta::FromMilliseconds(10001));
 
   EXPECT_TRUE(IsExpired(0));
   EXPECT_FALSE(data_use_matcher()->MatchesURL(GURL(kRegexFoo), &got_label));
   EXPECT_FALSE(data_use_matcher()->MatchesAppPackageName(kAppFoo, &got_label));
 }
 
 }  // namespace android
 
 }  // namespace chrome