Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(780)

Unified Diff: media/gpu/video_decode_accelerator_unittest.cc

Issue 2840593002: Remove usage of ScopedTaskScheduler. (Closed)
Patch Set: rebase Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/gpu/video_decode_accelerator_unittest.cc
diff --git a/media/gpu/video_decode_accelerator_unittest.cc b/media/gpu/video_decode_accelerator_unittest.cc
index 97ffb0595269d2795d1348af13b96dd0f8f93f52..c29a5ee848df2f84cc8d97fada2d0172a9bc14f1 100644
--- a/media/gpu/video_decode_accelerator_unittest.cc
+++ b/media/gpu/video_decode_accelerator_unittest.cc
@@ -50,7 +50,6 @@
#include "base/synchronization/lock.h"
#include "base/synchronization/waitable_event.h"
#include "base/test/launcher/unit_test_launcher.h"
-#include "base/test/scoped_task_scheduler.h"
#include "base/test/test_suite.h"
#include "base/threading/thread.h"
#include "base/threading/thread_task_runner_handle.h"
@@ -68,6 +67,7 @@
#include "ui/gl/gl_image.h"
#if defined(OS_WIN)
+#include "base/test/scoped_task_environment.h"
gab 2017/05/01 19:05:04 wrong include block
fdoray 2017/05/03 17:38:14 Done.
#include "base/win/windows_version.h"
#include "media/gpu/dxva_video_decode_accelerator_win.h"
#elif defined(OS_CHROMEOS)
@@ -1816,17 +1816,7 @@ class VDATestSuite : public base::TestSuite {
VDATestSuite(int argc, char** argv) : base::TestSuite(argc, argv) {}
int Run() {
-#if defined(OS_WIN) || defined(USE_OZONE)
- // For windows the decoding thread initializes the media foundation decoder
- // which uses COM. We need the thread to be a UI thread.
- // On Ozone, the backend initializes the event system using a UI
- // thread.
- base::MessageLoopForUI main_loop;
gab 2017/05/01 19:05:04 ForUI?
fdoray 2017/05/03 17:38:14 Done.
-#else
- base::MessageLoop main_loop;
-#endif // OS_WIN || USE_OZONE
-
- base::test::ScopedTaskScheduler scoped_task_scheduler(&main_loop);
+ base::test::ScopedTaskEnvironment scoped_task_environment;
media::g_env =
reinterpret_cast<media::VideoDecodeAcceleratorTestEnvironment*>(

Powered by Google App Engine
This is Rietveld 408576698