Commit 3ab73342 authored by Greg Kraynov's avatar Greg Kraynov Committed by Commit Bot

Remove cc::OrderedSimpleTaskRunner from DirectLayerTreeFrameSink tests.

Bug: 863350
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel
Change-Id: I7f4ade68fd7d504d06f276660e66ee7c01f20806
Reviewed-on: https://chromium-review.googlesource.com/1136549Reviewed-by: default avatarSami Kyöstilä <skyostil@chromium.org>
Commit-Queue: Greg Kraynov <kraynov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#574932}
parent 004406cf
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#include <memory> #include <memory>
#include "base/test/simple_test_tick_clock.h" #include "base/test/test_mock_time_task_runner.h"
#include "cc/test/fake_layer_tree_frame_sink_client.h" #include "cc/test/fake_layer_tree_frame_sink_client.h"
#include "components/viz/common/display/renderer_settings.h" #include "components/viz/common/display/renderer_settings.h"
#include "components/viz/common/frame_sinks/begin_frame_source.h" #include "components/viz/common/frame_sinks/begin_frame_source.h"
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
#include "components/viz/test/begin_frame_args_test.h" #include "components/viz/test/begin_frame_args_test.h"
#include "components/viz/test/compositor_frame_helpers.h" #include "components/viz/test/compositor_frame_helpers.h"
#include "components/viz/test/fake_output_surface.h" #include "components/viz/test/fake_output_surface.h"
#include "components/viz/test/ordered_simple_task_runner.h"
#include "components/viz/test/test_context_provider.h" #include "components/viz/test/test_context_provider.h"
#include "components/viz/test/test_gpu_memory_buffer_manager.h" #include "components/viz/test/test_gpu_memory_buffer_manager.h"
#include "components/viz/test/test_shared_bitmap_manager.h" #include "components/viz/test/test_shared_bitmap_manager.h"
...@@ -64,8 +63,8 @@ class TestCompositorFrameSinkSupportManager ...@@ -64,8 +63,8 @@ class TestCompositorFrameSinkSupportManager
class DirectLayerTreeFrameSinkTest : public testing::Test { class DirectLayerTreeFrameSinkTest : public testing::Test {
public: public:
DirectLayerTreeFrameSinkTest() DirectLayerTreeFrameSinkTest()
: now_src_(new base::SimpleTestTickClock()), : task_runner_(base::MakeRefCounted<base::TestMockTimeTaskRunner>(
task_runner_(new cc::OrderedSimpleTaskRunner(now_src_.get(), true)), base::TestMockTimeTaskRunner::Type::kStandalone)),
display_size_(1920, 1080), display_size_(1920, 1080),
display_rect_(display_size_), display_rect_(display_size_),
frame_sink_manager_(&bitmap_manager_), frame_sink_manager_(&bitmap_manager_),
...@@ -126,8 +125,7 @@ class DirectLayerTreeFrameSinkTest : public testing::Test { ...@@ -126,8 +125,7 @@ class DirectLayerTreeFrameSinkTest : public testing::Test {
} }
protected: protected:
std::unique_ptr<base::SimpleTestTickClock> now_src_; scoped_refptr<base::TestMockTimeTaskRunner> task_runner_;
scoped_refptr<cc::OrderedSimpleTaskRunner> task_runner_;
const gfx::Size display_size_; const gfx::Size display_size_;
const gfx::Rect display_rect_; const gfx::Rect display_rect_;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment