Make DataUseTabModel and DataUseMatcher more independent

chrome/browser/android/data_usage/data_use_ui_tab_model_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_ui_tab_model.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 #include <vector>
 
+#include "base/bind_helpers.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "chrome/browser/android/data_usage/data_use_tab_model.h"
 #include "chrome/browser/android/data_usage/data_use_ui_tab_model_factory.h"
 #include "chrome/browser/android/data_usage/external_data_use_observer.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/common/url_constants.h"
 #include "components/data_usage/core/data_use_aggregator.h"
@@ skipping 35 matching lines @@
 // Mock observer to track the calls to start and end tracking events.
 class MockTabDataUseObserver : public DataUseTabModel::TabDataUseObserver {
  public:
   MOCK_METHOD1(NotifyTrackingStarting, void(SessionID::id_type tab_id));
   MOCK_METHOD1(NotifyTrackingEnding, void(SessionID::id_type tab_id));
   MOCK_METHOD0(OnDataUseTabModelReady, void());
 };
 
 class TestDataUseTabModel : public DataUseTabModel {
  public:
-  TestDataUseTabModel() {}
+  TestDataUseTabModel()
+      : DataUseTabModel(base::Bind(&TestDataUseTabModel::FetchMatchingRules,
+                                   base::Unretained(this)),
+                        base::Bind(&TestDataUseTabModel::OnMatchingRulesFetched,
+                                   base::Unretained(this))) {}
   ~TestDataUseTabModel() override {}
 
+  void FetchMatchingRules() {}
+
+  void OnMatchingRulesFetched(bool is_valid) {}
+
   using DataUseTabModel::NotifyObserversOfTrackingStarting;
   using DataUseTabModel::NotifyObserversOfTrackingEnding;
 };
 
 class DataUseUITabModelTest : public testing::Test {
  public:
   DataUseUITabModelTest()
       : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP) {}
   DataUseUITabModel* data_use_ui_tab_model() { return &data_use_ui_tab_model_; }
 
@@ skipping 31 matching lines @@
 
     data_use_aggregator_.reset(
         new data_usage::DataUseAggregator(nullptr, nullptr));
 
     external_data_use_observer_.reset(new ExternalDataUseObserver(
         data_use_aggregator_.get(), io_task_runner_, ui_task_runner_));
     // Wait for |external_data_use_observer_| to create the Java object.
     base::RunLoop().RunUntilIdle();
 
     data_use_tab_model_.reset(new TestDataUseTabModel());
-    data_use_tab_model_->InitOnUIThread(
-        external_data_use_observer_->external_data_use_observer_bridge_);
   }
 
   void SetUpDataUseUITabModel() {
     data_use_ui_tab_model_.SetDataUseTabModel(data_use_tab_model_.get());
     data_use_tab_model_->OnControlAppInstallStateChange(true);
   }
 
  private:
   content::TestBrowserThreadBundle thread_bundle_;
   DataUseUITabModel data_use_ui_tab_model_;
@@ skipping 466 matching lines @@
   base::RunLoop().RunUntilIdle();
   RegisterURLRegexes(std::vector<std::string>(url_regexes.size(), kFooPackage),
                      url_regexes,
                      std::vector<std::string>(url_regexes.size(), kFooLabel));
   base::RunLoop().RunUntilIdle();
 }
 
 }  // namespace android
 
 }  // namespace chrome