| Index: third_party/WebKit/Source/platform/scheduler/child/worker_scheduler_impl_unittest.cc
|
| diff --git a/third_party/WebKit/Source/platform/scheduler/child/worker_scheduler_impl_unittest.cc b/third_party/WebKit/Source/platform/scheduler/child/worker_scheduler_impl_unittest.cc
|
| index e95e3775ab9c8a9868aa2f759a6ee15a28bedc02..67331cf571c9e527a5a0e779c409820cd28ffb0b 100644
|
| --- a/third_party/WebKit/Source/platform/scheduler/child/worker_scheduler_impl_unittest.cc
|
| +++ b/third_party/WebKit/Source/platform/scheduler/child/worker_scheduler_impl_unittest.cc
|
| @@ -16,7 +16,7 @@
|
| #include "testing/gmock/include/gmock/gmock.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| -using testing::ElementsAreArray;
|
| +using ::testing::ElementsAreArray;
|
|
|
| namespace blink {
|
| namespace scheduler {
|
| @@ -90,7 +90,7 @@ class WorkerSchedulerImplForTest : public WorkerSchedulerImpl {
|
| std::vector<std::string>* timeline_; // NOT OWNED
|
| };
|
|
|
| -class WorkerSchedulerImplTest : public testing::Test {
|
| +class WorkerSchedulerImplTest : public ::testing::Test {
|
| public:
|
| WorkerSchedulerImplTest()
|
| : clock_(new base::SimpleTestTickClock()),
|
| @@ -190,8 +190,8 @@ TEST_F(WorkerSchedulerImplTest, TestPostDefaultTask) {
|
|
|
| RunUntilIdle();
|
| EXPECT_THAT(run_order,
|
| - testing::ElementsAre(std::string("D1"), std::string("D2"),
|
| - std::string("D3"), std::string("D4")));
|
| + ::testing::ElementsAre(std::string("D1"), std::string("D2"),
|
| + std::string("D3"), std::string("D4")));
|
| }
|
|
|
| TEST_F(WorkerSchedulerImplTest, TestPostIdleTask) {
|
| @@ -201,7 +201,7 @@ TEST_F(WorkerSchedulerImplTest, TestPostIdleTask) {
|
| PostTestTasks(&run_order, "I1");
|
|
|
| RunUntilIdle();
|
| - EXPECT_THAT(run_order, testing::ElementsAre(std::string("I1")));
|
| + EXPECT_THAT(run_order, ::testing::ElementsAre(std::string("I1")));
|
| }
|
|
|
| TEST_F(WorkerSchedulerImplTest, TestPostDefaultAndIdleTasks) {
|
| @@ -212,8 +212,8 @@ TEST_F(WorkerSchedulerImplTest, TestPostDefaultAndIdleTasks) {
|
|
|
| RunUntilIdle();
|
| EXPECT_THAT(run_order,
|
| - testing::ElementsAre(std::string("D2"), std::string("D3"),
|
| - std::string("D4"), std::string("I1")));
|
| + ::testing::ElementsAre(std::string("D2"), std::string("D3"),
|
| + std::string("D4"), std::string("I1")));
|
| }
|
|
|
| TEST_F(WorkerSchedulerImplTest, TestPostDefaultDelayedAndIdleTasks) {
|
| @@ -228,9 +228,9 @@ TEST_F(WorkerSchedulerImplTest, TestPostDefaultDelayedAndIdleTasks) {
|
|
|
| RunUntilIdle();
|
| EXPECT_THAT(run_order,
|
| - testing::ElementsAre(std::string("D2"), std::string("D3"),
|
| - std::string("D4"), std::string("I1"),
|
| - std::string("DELAYED")));
|
| + ::testing::ElementsAre(std::string("D2"), std::string("D3"),
|
| + std::string("D4"), std::string("I1"),
|
| + std::string("DELAYED")));
|
| }
|
|
|
| TEST_F(WorkerSchedulerImplTest, TestIdleTaskWhenIsNotQuiescent) {
|
| @@ -325,8 +325,8 @@ TEST_F(WorkerSchedulerImplTest, TestPostIdleTaskAfterRunningUntilIdle) {
|
|
|
| RunUntilIdle();
|
| EXPECT_THAT(run_order,
|
| - testing::ElementsAre(std::string("D3"), std::string("I1"),
|
| - std::string("I2")));
|
| + ::testing::ElementsAre(std::string("D3"), std::string("I1"),
|
| + std::string("I2")));
|
| }
|
|
|
| void PostIdleTask(std::vector<std::string>* timeline,
|
|
|