Make DataUseTabModel and DataUseMatcher more independent

chrome/browser/android/data_usage/data_use_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_tab_model.h"
 
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string16.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/histogram_tester.h"
 #include "base/test/simple_test_tick_clock.h"
@@ skipping 86 matching lines @@
 class DataUseTabModelTest : public testing::Test {
  public:
   DataUseTabModelTest()
       : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP),
         external_data_use_observer_bridge_(
             new TestExternalDataUseObserverBridge()) {}
 
  protected:
   void SetUp() override {
     base::RunLoop().RunUntilIdle();
-    data_use_tab_model_.reset(new DataUseTabModel());
-    data_use_tab_model_->InitOnUIThread(
-        external_data_use_observer_bridge_.get());
+    data_use_tab_model_.reset(new DataUseTabModel(
+        base::Bind(&ExternalDataUseObserverBridge::FetchMatchingRules,
+                   base::Unretained(external_data_use_observer_bridge_.get())),
+        base::Bind(
+            &ExternalDataUseObserverBridge::ShouldRegisterAsDataUseObserver,
+            base::Unretained(external_data_use_observer_bridge_.get()))));
 
     tick_clock_ = new base::SimpleTestTickClock();
 
     // Advance to non nil time.
     tick_clock_->Advance(base::TimeDelta::FromSeconds(1));
 
     // |tick_clock_| will be owned by |data_use_tab_model_|.
     data_use_tab_model_->tick_clock_.reset(tick_clock_);
     data_use_tab_model_->OnControlAppInstallStateChange(true);
   }
@@ skipping 1003 matching lines @@
   RegisterURLRegexes(app_package_names, domain_regexes, labels);
   data_use_tab_model_->OnControlAppInstallStateChange(false);
   data_use_tab_model_->OnControlAppInstallStateChange(true);
   testing::Mock::VerifyAndClearExpectations(&mock_observer);
   EXPECT_TRUE(data_use_tab_model_->is_ready_for_navigation_event());
 }
 
 }  // namespace android
 
 }  // namespace chrome