Use TaskScheduler instead of blocking pool in render_widget_host_impl.cc.

chrome/browser/sessions/session_restore_stats_collector_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/sessions/session_restore_stats_collector.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/macros.h"
-#include "base/message_loop/message_loop.h"
 #include "base/test/simple_test_tick_clock.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
-#include "content/public/test/test_browser_thread.h"
+#include "content/public/test/test_browser_thread_bundle.h"
 #include "content/public/test/test_web_contents_factory.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 using TabLoaderStats = SessionRestoreStatsCollector::TabLoaderStats;
 using StatsReportingDelegate =
     SessionRestoreStatsCollector::StatsReportingDelegate;
 
 // A mock StatsReportingDelegate. This is used by the unittests to validate the
@@ skipping 144 matching lines @@
 
   base::SimpleTestTickClock* test_tick_clock_;
 
   DISALLOW_COPY_AND_ASSIGN(TestSessionRestoreStatsCollector);
 };
 
 class SessionRestoreStatsCollectorTest : public testing::Test {
  public:
   using RestoredTab = SessionRestoreDelegate::RestoredTab;
 
-  SessionRestoreStatsCollectorTest()
-      : ui_thread_(content::BrowserThread::UI, &message_loop_) {}
+  SessionRestoreStatsCollectorTest() = default;
 
   void SetUp() override {
     test_web_contents_factory_.reset(new content::TestWebContentsFactory);
 
     // Ownership of the reporting delegate is passed to the
     // SessionRestoreStatsCollector, but a raw pointer is kept to it so it can
     // be queried by the test.
     passthrough_reporting_delegate_ = new PassthroughStatsReportingDelegate();
 
     // Ownership of this clock is passed to the SessionRestoreStatsCollector.
@@ skipping 86 matching lines @@
         content::NotificationService::NoDetails());
   }
 
   // Defers a tab.
   void DeferTab(size_t tab_index) {
     content::WebContents* contents = restored_tabs_[tab_index].contents();
     content::NavigationController* controller = &contents->GetController();
     stats_collector_->DeferTab(controller);
   }
 
+  content::TestBrowserThreadBundle test_browser_thread_bundle_;
+  // |test_browser_thread_bundle_| needs to still be alive when
+  // |testing_profile_| is destroyed.
+  TestingProfile testing_profile_;
+
   // Inputs to the stats collector. Reset prior to each test.
   base::SimpleTestTickClock* test_tick_clock_;
   std::vector<RestoredTab> restored_tabs_;
 
-  // Infrastructure needed for using the TestWebContentsFactory. These are
-  // initialized once by the fixture and reused across unittests.
-  base::MessageLoop message_loop_;
-  content::TestBrowserThread ui_thread_;
-  // |ui_thread_| needs to still be alive when |testing_profile_| is destroyed.
-  TestingProfile testing_profile_;
-
   // A new web contents factory is generated per test. This automatically cleans
   // up any tabs created by previous tests.
   std::unique_ptr<content::TestWebContentsFactory> test_web_contents_factory_;
 
   // These are recreated for each test. The reporting delegate allows the test
   // to observe the behaviour of the SessionRestoreStatsCollector under test.
   PassthroughStatsReportingDelegate* passthrough_reporting_delegate_;
   TestSessionRestoreStatsCollector* stats_collector_;
 
  private:
@@ skipping 319 matching lines @@
   mock_reporting_delegate.ExpectReportTabLoaderStatsCalled(2, 1, 1, 0, 0, 0, 0,
                                                            1);
   mock_reporting_delegate.EnsureNoUnexpectedCalls();
 
   // Destroy the background tab. The collector should release itself.
   Tick();  // 3 ms.
   GenerateWebContentsDestroyed(1);
   mock_reporting_delegate.ExpectReportStatsCollectorDeathCalled();
   mock_reporting_delegate.EnsureNoUnexpectedCalls();
 }