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

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

Issue 930063002: Revert of scheduler: Implement task observers (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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/task_queue_manager_unittest.cc
diff --git a/content/renderer/scheduler/task_queue_manager_unittest.cc b/content/renderer/scheduler/task_queue_manager_unittest.cc
index 7033815a97070b5cfcaaa798c8c2a5496c4bc6fa..62e6c349c372dd16a92bd74488a27f23eaf3743a 100644
--- a/content/renderer/scheduler/task_queue_manager_unittest.cc
+++ b/content/renderer/scheduler/task_queue_manager_unittest.cc
@@ -11,7 +11,6 @@
#include "testing/gmock/include/gmock/gmock.h"
using testing::ElementsAre;
-using testing::_;
namespace content {
namespace {
@@ -583,73 +582,5 @@
EXPECT_THAT(run_order, ElementsAre(2, 3, 1));
}
-class MockTaskObserver : public base::MessageLoop::TaskObserver {
- public:
- MOCK_METHOD1(DidProcessTask, void(const base::PendingTask& task));
- MOCK_METHOD1(WillProcessTask, void(const base::PendingTask& task));
-};
-
-TEST_F(TaskQueueManagerTest, TaskObserverAdding) {
- Initialize(1u);
- MockTaskObserver observer;
-
- manager_->AddTaskObserver(&observer);
-
- std::vector<int> run_order;
- scoped_refptr<base::SingleThreadTaskRunner> runner =
- manager_->TaskRunnerForQueue(0);
-
- runner->PostTask(FROM_HERE, base::Bind(&TestTask, 1, &run_order));
- runner->PostTask(FROM_HERE, base::Bind(&TestTask, 2, &run_order));
-
- selector_->AppendQueueToService(0);
- selector_->AppendQueueToService(0);
-
- EXPECT_CALL(observer, WillProcessTask(_)).Times(2);
- EXPECT_CALL(observer, DidProcessTask(_)).Times(2);
- test_task_runner_->RunUntilIdle();
-}
-
-TEST_F(TaskQueueManagerTest, TaskObserverRemoving) {
- Initialize(1u);
- MockTaskObserver observer;
- manager_->AddTaskObserver(&observer);
- manager_->RemoveTaskObserver(&observer);
-
- std::vector<int> run_order;
- scoped_refptr<base::SingleThreadTaskRunner> runner =
- manager_->TaskRunnerForQueue(0);
-
- runner->PostTask(FROM_HERE, base::Bind(&TestTask, 1, &run_order));
-
- EXPECT_CALL(observer, WillProcessTask(_)).Times(0);
- EXPECT_CALL(observer, DidProcessTask(_)).Times(0);
-
- selector_->AppendQueueToService(0);
- test_task_runner_->RunUntilIdle();
-}
-
-void RemoveObserverTask(TaskQueueManager* manager,
- base::MessageLoop::TaskObserver* observer) {
- manager->RemoveTaskObserver(observer);
-}
-
-TEST_F(TaskQueueManagerTest, TaskObserverRemovingInsideTask) {
- Initialize(1u);
- MockTaskObserver observer;
- manager_->AddTaskObserver(&observer);
-
- scoped_refptr<base::SingleThreadTaskRunner> runner =
- manager_->TaskRunnerForQueue(0);
- runner->PostTask(FROM_HERE,
- base::Bind(&RemoveObserverTask, manager_.get(), &observer));
-
- selector_->AppendQueueToService(0);
-
- EXPECT_CALL(observer, WillProcessTask(_)).Times(1);
- EXPECT_CALL(observer, DidProcessTask(_)).Times(0);
- test_task_runner_->RunUntilIdle();
-}
-
} // namespace
} // namespace content
« no previous file with comments | « content/renderer/scheduler/task_queue_manager.cc ('k') | content/renderer/scheduler/webthread_impl_for_scheduler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698