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

Unified Diff: third_party/WebKit/Source/platform/scheduler/child/worker_global_scope_scheduler_unittest.cc

Issue 2967013002: Be explicit about namespace testing to not mix it with blink::testing (Closed)
Patch Set: Dropped mojo parts that need another review. Created 3 years, 5 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: third_party/WebKit/Source/platform/scheduler/child/worker_global_scope_scheduler_unittest.cc
diff --git a/third_party/WebKit/Source/platform/scheduler/child/worker_global_scope_scheduler_unittest.cc b/third_party/WebKit/Source/platform/scheduler/child/worker_global_scope_scheduler_unittest.cc
index 2fb71531ca9371ac2cd046f8a3d9729e225edbb8..2725937feeb41e5eb2aecda2c42781b16fc843cc 100644
--- a/third_party/WebKit/Source/platform/scheduler/child/worker_global_scope_scheduler_unittest.cc
+++ b/third_party/WebKit/Source/platform/scheduler/child/worker_global_scope_scheduler_unittest.cc
@@ -14,7 +14,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 {
@@ -28,7 +28,7 @@ void AppendToVectorTestTask(std::vector<std::string>* vector,
} // namespace
-class WorkerGlobalScopeSchedulerTest : public testing::Test {
+class WorkerGlobalScopeSchedulerTest : public ::testing::Test {
public:
WorkerGlobalScopeSchedulerTest()
: clock_(new base::SimpleTestTickClock()),
@@ -76,7 +76,7 @@ TEST_F(WorkerGlobalScopeSchedulerTest, TestPostTasks) {
RunUntilIdle();
PostTestTask(&run_order, "T3");
RunUntilIdle();
- EXPECT_THAT(run_order, testing::ElementsAre("T1", "T2", "T3"));
+ EXPECT_THAT(run_order, ::testing::ElementsAre("T1", "T2", "T3"));
// Tasks should not run after the scheduler is disposed of.
global_scope_scheduler_->Dispose();

Powered by Google App Engine
This is Rietveld 408576698