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

Unified Diff: content/renderer/scheduler/webthread_impl_for_renderer_scheduler_unittest.cc

Issue 1088933002: Revert of Add a WorkerScheduler and a WebThreadImplForWorker (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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: content/renderer/scheduler/webthread_impl_for_renderer_scheduler_unittest.cc
diff --git a/content/renderer/scheduler/webthread_impl_for_renderer_scheduler_unittest.cc b/content/renderer/scheduler/webthread_impl_for_renderer_scheduler_unittest.cc
deleted file mode 100644
index 191a2710480b52ab4fcead0da754ab0bcd69b4e7..0000000000000000000000000000000000000000
--- a/content/renderer/scheduler/webthread_impl_for_renderer_scheduler_unittest.cc
+++ /dev/null
@@ -1,202 +0,0 @@
-// 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 "content/renderer/scheduler/webthread_impl_for_renderer_scheduler.h"
-
-#include "base/run_loop.h"
-#include "content/child/scheduler/scheduler_message_loop_delegate.h"
-#include "content/renderer/scheduler/renderer_scheduler_impl.h"
-#include "testing/gmock/include/gmock/gmock.h"
-#include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/WebKit/public/platform/WebTraceLocation.h"
-
-namespace content {
-namespace {
-
-const int kWorkBatchSize = 2;
-
-class MockTask : public blink::WebThread::Task {
- public:
- MOCK_METHOD0(run, void());
-};
-
-class MockTaskObserver : public blink::WebThread::TaskObserver {
- public:
- MOCK_METHOD0(willProcessTask, void());
- MOCK_METHOD0(didProcessTask, void());
-};
-} // namespace
-
-class WebThreadImplForRendererSchedulerTest : public testing::Test {
- public:
- WebThreadImplForRendererSchedulerTest()
- : scheduler_(SchedulerMessageLoopDelegate::Create(&message_loop_)),
- default_task_runner_(scheduler_.DefaultTaskRunner()),
- thread_(&scheduler_) {}
-
- ~WebThreadImplForRendererSchedulerTest() override {}
-
- void SetWorkBatchSizeForTesting(size_t work_batch_size) {
- scheduler_.SetWorkBatchSizeForTesting(work_batch_size);
- }
-
- protected:
- void EatDefaultTask(MockTaskObserver* observer) {
- // The scheduler posts one extra DoWork() task automatically.
- EXPECT_CALL(*observer, willProcessTask());
- EXPECT_CALL(*observer, didProcessTask());
- }
-
- base::MessageLoop message_loop_;
- RendererSchedulerImpl scheduler_;
- scoped_refptr<base::SingleThreadTaskRunner> default_task_runner_;
- WebThreadImplForRendererScheduler thread_;
-
- DISALLOW_COPY_AND_ASSIGN(WebThreadImplForRendererSchedulerTest);
-};
-
-TEST_F(WebThreadImplForRendererSchedulerTest, TestTaskObserver) {
- MockTaskObserver observer;
- thread_.addTaskObserver(&observer);
- scoped_ptr<MockTask> task(new MockTask());
-
- {
- testing::InSequence sequence;
- EXPECT_CALL(observer, willProcessTask());
- EXPECT_CALL(*task, run());
- EXPECT_CALL(observer, didProcessTask());
-
- EatDefaultTask(&observer);
- }
-
- thread_.postTask(blink::WebTraceLocation(), task.release());
- message_loop_.RunUntilIdle();
- thread_.removeTaskObserver(&observer);
-}
-
-TEST_F(WebThreadImplForRendererSchedulerTest, TestWorkBatchWithOneTask) {
- MockTaskObserver observer;
- thread_.addTaskObserver(&observer);
- scoped_ptr<MockTask> task(new MockTask());
-
- scheduler_.SetWorkBatchSizeForTesting(kWorkBatchSize);
- {
- testing::InSequence sequence;
- EXPECT_CALL(observer, willProcessTask());
- EXPECT_CALL(*task, run());
- EXPECT_CALL(observer, didProcessTask());
-
- EatDefaultTask(&observer);
- }
-
- thread_.postTask(blink::WebTraceLocation(), task.release());
- message_loop_.RunUntilIdle();
- thread_.removeTaskObserver(&observer);
-}
-
-TEST_F(WebThreadImplForRendererSchedulerTest, TestWorkBatchWithTwoTasks) {
- MockTaskObserver observer;
- thread_.addTaskObserver(&observer);
- scoped_ptr<MockTask> task1(new MockTask());
- scoped_ptr<MockTask> task2(new MockTask());
-
- scheduler_.SetWorkBatchSizeForTesting(kWorkBatchSize);
- {
- testing::InSequence sequence;
- EXPECT_CALL(observer, willProcessTask());
- EXPECT_CALL(*task1, run());
- EXPECT_CALL(observer, didProcessTask());
-
- EXPECT_CALL(observer, willProcessTask());
- EXPECT_CALL(*task2, run());
- EXPECT_CALL(observer, didProcessTask());
-
- EatDefaultTask(&observer);
- }
-
- thread_.postTask(blink::WebTraceLocation(), task1.release());
- thread_.postTask(blink::WebTraceLocation(), task2.release());
- message_loop_.RunUntilIdle();
- thread_.removeTaskObserver(&observer);
-}
-
-TEST_F(WebThreadImplForRendererSchedulerTest, TestWorkBatchWithThreeTasks) {
- MockTaskObserver observer;
- thread_.addTaskObserver(&observer);
- scoped_ptr<MockTask> task1(new MockTask());
- scoped_ptr<MockTask> task2(new MockTask());
- scoped_ptr<MockTask> task3(new MockTask());
-
- scheduler_.SetWorkBatchSizeForTesting(kWorkBatchSize);
- {
- testing::InSequence sequence;
- EXPECT_CALL(observer, willProcessTask());
- EXPECT_CALL(*task1, run());
- EXPECT_CALL(observer, didProcessTask());
-
- EXPECT_CALL(observer, willProcessTask());
- EXPECT_CALL(*task2, run());
- EXPECT_CALL(observer, didProcessTask());
-
- EXPECT_CALL(observer, willProcessTask());
- EXPECT_CALL(*task3, run());
- EXPECT_CALL(observer, didProcessTask());
-
- EatDefaultTask(&observer);
- }
-
- thread_.postTask(blink::WebTraceLocation(), task1.release());
- thread_.postTask(blink::WebTraceLocation(), task2.release());
- thread_.postTask(blink::WebTraceLocation(), task3.release());
- message_loop_.RunUntilIdle();
- thread_.removeTaskObserver(&observer);
-}
-
-class ExitRunLoopTask : public blink::WebThread::Task {
- public:
- ExitRunLoopTask(base::RunLoop* run_loop) : run_loop_(run_loop) {}
-
- virtual void run() { run_loop_->Quit(); }
-
- private:
- base::RunLoop* run_loop_;
-};
-
-void EnterRunLoop(base::MessageLoop* message_loop, blink::WebThread* thread) {
- // Note: WebThreads do not support nested run loops, which is why we use a
- // run loop directly.
- base::RunLoop run_loop;
- thread->postTask(blink::WebTraceLocation(), new ExitRunLoopTask(&run_loop));
- message_loop->SetNestableTasksAllowed(true);
- run_loop.Run();
-}
-
-TEST_F(WebThreadImplForRendererSchedulerTest, TestNestedRunLoop) {
- MockTaskObserver observer;
- thread_.addTaskObserver(&observer);
-
- {
- testing::InSequence sequence;
-
- // One callback for EnterRunLoop.
- EXPECT_CALL(observer, willProcessTask());
-
- // A pair for ExitRunLoopTask.
- EXPECT_CALL(observer, willProcessTask());
- EXPECT_CALL(observer, didProcessTask());
-
- // A final callback for EnterRunLoop.
- EXPECT_CALL(observer, didProcessTask());
-
- EatDefaultTask(&observer);
- }
-
- message_loop_.PostTask(
- FROM_HERE, base::Bind(&EnterRunLoop, base::Unretained(&message_loop_),
- base::Unretained(&thread_)));
- message_loop_.RunUntilIdle();
- thread_.removeTaskObserver(&observer);
-}
-
-} // namespace content

Powered by Google App Engine
This is Rietveld 408576698