Use ScopedTaskEnvironment instead of MessageLoopForUI in ui tests.

ui/gfx/render_text_unittest.cc

 // Copyright (c) 2012 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 "ui/gfx/render_text.h"
 
 #include <limits.h>
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
 #include <memory>
 #include <numeric>
 
 #include "base/format_macros.h"
 #include "base/i18n/break_iterator.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/test/scoped_task_environment.h"
 #include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkRefCnt.h"
 #include "third_party/skia/include/core/SkSurface.h"
 #include "third_party/skia/include/core/SkTypeface.h"
 #include "ui/gfx/break_list.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/decorated_text.h"
 #include "ui/gfx/font.h"
@@ skipping 386 matching lines @@
 };
 
 }  // namespace
 
 // Test fixture class used to run parameterized tests for all RenderText
 // implementations.
 class RenderTextTest : public testing::Test,
                        public ::testing::WithParamInterface<RenderTextBackend> {
  public:
   RenderTextTest()
-      : render_text_(CreateRenderTextInstance()),
+      : scoped_task_environment_(
+            base::test::ScopedTaskEnvironment::MainThreadType::UI),
+        render_text_(CreateRenderTextInstance()),
         test_api_(new test::RenderTextTestApi(render_text_.get())),
         renderer_(canvas()) {}
 
  protected:
   std::unique_ptr<RenderText> CreateRenderTextInstance() const {
     switch (GetParam()) {
       case RENDER_TEXT_HARFBUZZ:
         return base::MakeUnique<RenderTextHarfBuzz>();
 
       case RENDER_TEXT_MAC:
@@ skipping 45 matching lines @@
 
   Rect GetSelectionBoundsUnion() {
     return GetSubstringBoundsUnion(render_text_->selection());
   }
 
   Canvas* canvas() { return &canvas_; }
   TestSkiaTextRenderer* renderer() { return &renderer_; }
   test::RenderTextTestApi* test_api() { return test_api_.get(); };
 
  private:
+  // Needed to bypass DCHECK in GetFallbackFont.
+  base::test::ScopedTaskEnvironment scoped_task_environment_;
+
   std::unique_ptr<RenderText> render_text_;
   std::unique_ptr<test::RenderTextTestApi> test_api_;
   Canvas canvas_;
   TestSkiaTextRenderer renderer_;
 
-#if defined(OS_WIN)
-  // Needed to bypass DCHECK in GetFallbackFont.
-  base::MessageLoopForUI message_loop_;
-#endif
-
   DISALLOW_COPY_AND_ASSIGN(RenderTextTest);
 };
 
 // Test fixture class. Use for tests which are only to be run for
 // RenderTextHarfBuzz.
 class RenderTextHarfBuzzTest : public RenderTextTest {
  public:
   RenderTextHarfBuzzTest() {}
 
   // Overridden from testing::Test:
@@ skipping 4032 matching lines @@
                         ::testing::Values(RENDER_TEXT_HARFBUZZ),
                         PrintRenderTextBackend());
 #endif
 
 INSTANTIATE_TEST_CASE_P(,
                         RenderTextHarfBuzzTest,
                         ::testing::Values(RENDER_TEXT_HARFBUZZ),
                         PrintRenderTextBackend());
 
 }  // namespace gfx