| Index: content/renderer/scheduler_proxy_task_runner_browsertest.cc
|
| diff --git a/content/renderer/scheduler_proxy_task_runner_browsertest.cc b/content/renderer/scheduler_proxy_task_runner_browsertest.cc
|
| index d67c54dbd21d13153cf06d1d327a9529a7b89002..d2088e11bfebee9cba0609fe703e891d736daae5 100644
|
| --- a/content/renderer/scheduler_proxy_task_runner_browsertest.cc
|
| +++ b/content/renderer/scheduler_proxy_task_runner_browsertest.cc
|
| @@ -48,29 +48,16 @@ TEST(SchedulerProxyTaskRunnerBrowserTest, TestTaskPosting) {
|
| RenderThreadImpl* thread = new RenderThreadImpl(channel_id);
|
| thread->EnsureWebKitInitialized();
|
|
|
| - scoped_refptr<base::SingleThreadTaskRunner> input_task_runner =
|
| - make_scoped_refptr(new SchedulerProxyTaskRunner<
|
| - &blink::WebSchedulerProxy::postInputTask>());
|
| scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner =
|
| - make_scoped_refptr(new SchedulerProxyTaskRunner<
|
| - &blink::WebSchedulerProxy::postCompositorTask>());
|
| + thread->main_thread_compositor_task_runner();
|
|
|
| - int input_order = 0;
|
| - int compositor_order = 0;
|
| + EXPECT_TRUE(compositor_task_runner->BelongsToCurrentThread());
|
|
|
| - input_task_runner->PostTask(FROM_HERE,
|
| - base::Bind(&TestTask, 1, &input_order));
|
| + int compositor_order = 0;
|
| compositor_task_runner->PostTask(FROM_HERE,
|
| base::Bind(&TestTask, 1, &compositor_order));
|
| - input_task_runner->PostTask(FROM_HERE,
|
| - base::Bind(&TestTask, 2, &input_order));
|
| compositor_task_runner->PostTask(FROM_HERE,
|
| base::Bind(&TestTask, 2, &compositor_order));
|
| -
|
| - input_task_runner->PostTask(FROM_HERE,
|
| - base::Bind(&TestTask, 3, &input_order));
|
| - input_task_runner->PostTask(FROM_HERE,
|
| - base::Bind(&TestTask, 4, &input_order));
|
| compositor_task_runner->PostTask(FROM_HERE,
|
| base::Bind(&TestTask, 3, &compositor_order));
|
| compositor_task_runner->PostTask(FROM_HERE,
|
| @@ -78,7 +65,6 @@ TEST(SchedulerProxyTaskRunnerBrowserTest, TestTaskPosting) {
|
|
|
| message_loop.RunUntilIdle();
|
|
|
| - EXPECT_EQ(0x1234, input_order);
|
| EXPECT_EQ(0x1234, compositor_order);
|
| }
|
|
|
|
|