Use ScopedTaskEnvironment instead of MessageLoopForUI in ViewsTestBase.

chrome/browser/ui/views/toolbar/toolbar_action_view_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/ui/views/toolbar/toolbar_action_view.h"
+
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/scoped_task_scheduler.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/ui/toolbar/test_toolbar_action_view_controller.h"
 #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h"
-#include "chrome/browser/ui/views/toolbar/toolbar_action_view.h"
 #include "chrome/test/base/testing_profile.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 "ui/accessibility/ax_node_data.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/views/test/views_test_base.h"
 
 namespace {
 
 // A test delegate for a toolbar action view.
 class TestToolbarActionViewDelegate : public ToolbarActionView::Delegate {
  public:
@@ skipping 64 matching lines @@
 
   bool opened_menu_;
 
   DISALLOW_COPY_AND_ASSIGN(OpenMenuListener);
 };
 
 }  // namespace
 
 class ToolbarActionViewUnitTest : public views::ViewsTestBase {
  public:
-  ToolbarActionViewUnitTest()
-      : widget_(nullptr),
-        ui_thread_(content::BrowserThread::UI, message_loop()),
-        scoped_task_scheduler_(base::MessageLoop::current()) {}
+  ToolbarActionViewUnitTest() : widget_(nullptr) {}
   ~ToolbarActionViewUnitTest() override {}
 
   void SetUp() override {
     views::ViewsTestBase::SetUp();
 
     widget_ = new views::Widget;
     views::Widget::InitParams params =
         CreateParams(views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
     params.bounds = gfx::Rect(0, 0, 200, 200);
     widget_->Init(params);
   }
   void TearDown() override {
     if (!widget_->IsClosed())
       widget_->Close();
     views::ViewsTestBase::TearDown();
   }
 
   views::Widget* widget() { return widget_; }
 
  private:
+  // Web contents need a UI thread and a TaskScheduler.
+  content::TestBrowserThreadBundle test_browser_thread_bundle_;
+
   // The widget managed by this test.
   views::Widget* widget_;
 
-  // Web contents need a UI thread and a TaskScheduler.
-  content::TestBrowserThread ui_thread_;
-  base::test::ScopedTaskScheduler scoped_task_scheduler_;
-
   DISALLOW_COPY_AND_ASSIGN(ToolbarActionViewUnitTest);
 };
 
 // A MenuButton subclass that provides access to some MenuButton internals.
 class TestToolbarActionView : public ToolbarActionView {
  public:
   TestToolbarActionView(ToolbarActionViewController* view_controller,
                         Delegate* delegate)
       : ToolbarActionView(view_controller, delegate) {}
 
@@ skipping 139 matching lines @@
   // If the view isn't visible, the overflow button should be pressed for
   // popups.
   view.SetVisible(false);
   controller.ShowPopup(true);
   EXPECT_EQ(views::Button::STATE_NORMAL, view.state());
   EXPECT_EQ(views::Button::STATE_PRESSED, overflow_button.state());
   controller.HidePopup();
   EXPECT_EQ(views::Button::STATE_NORMAL, view.state());
   EXPECT_EQ(views::Button::STATE_NORMAL, overflow_button.state());
 }