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

Unified Diff: third_party/WebKit/Source/platform/scheduler/child/scheduler_helper_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/scheduler_helper_unittest.cc
diff --git a/third_party/WebKit/Source/platform/scheduler/child/scheduler_helper_unittest.cc b/third_party/WebKit/Source/platform/scheduler/child/scheduler_helper_unittest.cc
index 5e6ab9918842cc1618a1029addfb0ad66f4b8ce3..f3dae9237dffe1aaf1b5b450e116b8b6045f684c 100644
--- a/third_party/WebKit/Source/platform/scheduler/child/scheduler_helper_unittest.cc
+++ b/third_party/WebKit/Source/platform/scheduler/child/scheduler_helper_unittest.cc
@@ -18,10 +18,10 @@
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
-using testing::_;
-using testing::AnyNumber;
-using testing::Invoke;
-using testing::Return;
+using ::testing::_;
+using ::testing::AnyNumber;
+using ::testing::Invoke;
+using ::testing::Return;
namespace blink {
namespace scheduler {
@@ -47,7 +47,7 @@ void AppendToVectorReentrantTask(base::SingleThreadTaskRunner* task_runner,
}; // namespace
-class SchedulerHelperTest : public testing::Test {
+class SchedulerHelperTest : public ::testing::Test {
public:
SchedulerHelperTest()
: clock_(new base::SimpleTestTickClock()),
@@ -105,8 +105,8 @@ TEST_F(SchedulerHelperTest, 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(SchedulerHelperTest, TestRentrantTask) {
@@ -118,7 +118,7 @@ TEST_F(SchedulerHelperTest, TestRentrantTask) {
&count, 5));
RunUntilIdle();
- EXPECT_THAT(run_order, testing::ElementsAre(0, 1, 2, 3, 4));
+ EXPECT_THAT(run_order, ::testing::ElementsAre(0, 1, 2, 3, 4));
}
TEST_F(SchedulerHelperTest, IsShutdown) {

Powered by Google App Engine
This is Rietveld 408576698