Remove one thread hop while fetching matching rules

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 <string>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.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/stringprintf.h"
 #include "base/test/histogram_tester.h"
 #include "base/test/simple_test_tick_clock.h"
 #include "base/time/time.h"
 #include "chrome/browser/android/data_usage/data_use_matcher.h"
+#include "chrome/browser/android/data_usage/external_data_use_observer_bridge.h"
 #include "chrome/browser/android/data_usage/tab_data_use_entry.h"
 #include "components/data_usage/core/data_use_aggregator.h"
 #include "components/data_usage/core/data_use_amortizer.h"
 #include "components/data_usage/core/data_use_annotator.h"
 #include "components/sessions/core/session_id.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "net/base/network_change_notifier.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 28 matching lines @@
 };
 
 // Mock observer to track the calls to start and end tracking events.
 class MockTabDataUseObserver
     : public chrome::android::DataUseTabModel::TabDataUseObserver {
  public:
   MOCK_METHOD1(NotifyTrackingStarting, void(SessionID::id_type tab_id));
   MOCK_METHOD1(NotifyTrackingEnding, void(SessionID::id_type tab_id));
 };
 
+class TestExternalDataUseObserverBridge
+    : public chrome::android::ExternalDataUseObserverBridge {
+ public:
+  TestExternalDataUseObserverBridge() {}
+  void FetchMatchingRules() const override {}
+  void ShouldRegisterAsDataUseObserver(bool should_register) const override{};
+};
+
 }  // namespace
 
 namespace chrome {
 
 namespace android {
 
-class ExternalDataUseObserver;
-
 class DataUseTabModelTest : public testing::Test {
  public:
   DataUseTabModelTest()
-      : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP) {}
+      : 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(
-        content::BrowserThread::GetMessageLoopProxyForThread(
-            content::BrowserThread::IO),
-        base::WeakPtr<ExternalDataUseObserver>());
+        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 81 matching lines @@
                                             labels);
   }
 
   // Pointer to the tick clock owned by |data_use_tab_model_|.
   base::SimpleTestTickClock* tick_clock_;
 
   scoped_ptr<DataUseTabModel> data_use_tab_model_;
 
  private:
   content::TestBrowserThreadBundle thread_bundle_;
+  scoped_ptr<ExternalDataUseObserverBridge> external_data_use_observer_bridge_;
 
   DISALLOW_COPY_AND_ASSIGN(DataUseTabModelTest);
 };
 
 // Starts and ends tracking a single tab and checks if its label is returned
 // correctly for DataUse objects.
 TEST_F(DataUseTabModelTest, SingleTabTracking) {
   ExpectTabEntrySize(TabEntrySize::ZERO);
 
   // No label is applied initially.
@@ skipping 706 matching lines @@
 
   data_use_tab_model_->OnControlAppInstallStateChange(false);
 
   EXPECT_FALSE(IsTrackingDataUse(kTabID1));
   EXPECT_FALSE(data_use_tab_model_->data_use_matcher_->HasValidRules());
 }
 
 }  // namespace android
 
 }  // namespace chrome