Make DataUseTabModel and DataUseMatcher more independent

chrome/browser/android/data_usage/tab_data_use_entry_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/tab_data_use_entry.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/macros.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 "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 // Tracking labels for tests.
-const std::string kTestLabel1 = "label_1";
-const std::string kTestLabel2 = "label_2";
-const std::string kTestLabel3 = "label_3";
+const char kTestLabel1[] = "label_1";
+const char kTestLabel2[] = "label_2";
+const char kTestLabel3[] = "label_3";
 
 enum TabEntrySessionSize { ZERO = 0, ONE, TWO, THREE };
 
 }  // namespace
 
 namespace chrome {
 
 namespace android {
 
 // Test version of |TickClock|.
@@ skipping 23 matching lines @@
   // Represents the delta offset to be added to current time that is returned by
   // NowTicks.
   base::TimeDelta now_offset_;
 
   DISALLOW_COPY_AND_ASSIGN(SimpleOffsetTestTickClock);
 };
 
 class TabDataUseEntryTest : public testing::Test {
  public:
   TabDataUseEntryTest() {
-    tab_model_.reset(new DataUseTabModel());
+    tab_model_.reset(new DataUseTabModel(
+        base::Bind(&TabDataUseEntryTest::FetchMatchingRules,
+                   base::Unretained(this)),
+        base::Bind(&TabDataUseEntryTest::OnMatchingRulesFetched,
+                   base::Unretained(this))));
     tick_clock_ = new SimpleOffsetTestTickClock();
     tab_model_->tick_clock_.reset(tick_clock_);
     tab_entry_.reset(new TabDataUseEntry(tab_model_.get()));
   }
 
+  void FetchMatchingRules() {}
+
+  void OnMatchingRulesFetched(bool is_valid) {}
+
   size_t GetMaxSessionsPerTab() const {
     return tab_model_->max_sessions_per_tab();
   }
 
   const base::TimeDelta& GetClosedTabExpirationDuration() const {
     return tab_model_->closed_tab_expiration_duration();
   }
 
   const base::TimeDelta& GetOpenTabExpirationDuration() const {
     return tab_model_->open_tab_expiration_duration();
@@ skipping 454 matching lines @@
   EXPECT_TRUE(tab_entry_->EndTracking());
 
   histogram_tester.ExpectUniqueSample(
       kUMAOldInactiveSessionRemovalDurationSecondsHistogram,
       base::TimeDelta::FromSeconds(30).InMilliseconds(), 1);
 }
 
 }  // namespace android
 
 }  // namespace chrome