| Index: Source/platform/scheduler/SchedulerTest.cpp
|
| diff --git a/Source/platform/scheduler/SchedulerTest.cpp b/Source/platform/scheduler/SchedulerTest.cpp
|
| index 3a78e01a5f7ec4ec7c1ce3b58a3fe9b795cebef5..f749a46bf7229884b87ee2f062bb0a816e3a06c0 100644
|
| --- a/Source/platform/scheduler/SchedulerTest.cpp
|
| +++ b/Source/platform/scheduler/SchedulerTest.cpp
|
| @@ -16,7 +16,6 @@
|
| #include <vector>
|
|
|
| using blink::Scheduler;
|
| -using namespace std;
|
|
|
| namespace {
|
|
|
| @@ -137,7 +136,7 @@ public:
|
| m_platformSupport.runPendingTasks();
|
| }
|
|
|
| - void appendToVector(string value)
|
| + void appendToVector(std::string value)
|
| {
|
| m_order.push_back(value);
|
| }
|
| @@ -172,7 +171,7 @@ public:
|
| protected:
|
| SchedulerTestingPlatformSupport m_platformSupport;
|
| Scheduler* m_scheduler;
|
| - std::vector<string> m_order;
|
| + std::vector<std::string> m_order;
|
| std::vector<int> m_reentrantOrder;
|
| int m_reentrantCount;
|
| int m_maxRecursion;
|
| @@ -253,16 +252,16 @@ TEST_F(SchedulerTest, TestIdleTask)
|
|
|
| TEST_F(SchedulerTest, TestTaskPrioritization)
|
| {
|
| - m_scheduler->postTask(FROM_HERE, WTF::bind(&SchedulerTest::appendToVector, this, string("L1")));
|
| - m_scheduler->postTask(FROM_HERE, WTF::bind(&SchedulerTest::appendToVector, this, string("L2")));
|
| - m_scheduler->postInputTask(FROM_HERE, WTF::bind(&SchedulerTest::appendToVector, this, string("I1")));
|
| - m_scheduler->postCompositorTask(FROM_HERE, WTF::bind(&SchedulerTest::appendToVector, this, string("C1")));
|
| - m_scheduler->postInputTask(FROM_HERE, WTF::bind(&SchedulerTest::appendToVector, this, string("I2")));
|
| - m_scheduler->postCompositorTask(FROM_HERE, WTF::bind(&SchedulerTest::appendToVector, this, string("C2")));
|
| + m_scheduler->postTask(FROM_HERE, WTF::bind(&SchedulerTest::appendToVector, this, std::string("L1")));
|
| + m_scheduler->postTask(FROM_HERE, WTF::bind(&SchedulerTest::appendToVector, this, std::string("L2")));
|
| + m_scheduler->postInputTask(FROM_HERE, WTF::bind(&SchedulerTest::appendToVector, this, std::string("I1")));
|
| + m_scheduler->postCompositorTask(FROM_HERE, WTF::bind(&SchedulerTest::appendToVector, this, std::string("C1")));
|
| + m_scheduler->postInputTask(FROM_HERE, WTF::bind(&SchedulerTest::appendToVector, this, std::string("I2")));
|
| + m_scheduler->postCompositorTask(FROM_HERE, WTF::bind(&SchedulerTest::appendToVector, this, std::string("C2")));
|
|
|
| runPendingTasks();
|
| EXPECT_THAT(m_order, testing::ElementsAre(
|
| - string("I1"), string("C1"), string("I2"), string("C2"), string("L1"), string("L2")));
|
| + std::string("I1"), std::string("C1"), std::string("I2"), std::string("C2"), std::string("L1"), std::string("L2")));
|
| }
|
|
|
| TEST_F(SchedulerTest, TestRentrantTask)
|
|
|