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

Unified Diff: third_party/WebKit/Source/platform/scheduler/base/time_domain_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/base/time_domain_unittest.cc
diff --git a/third_party/WebKit/Source/platform/scheduler/base/time_domain_unittest.cc b/third_party/WebKit/Source/platform/scheduler/base/time_domain_unittest.cc
index 0107d4da02ceb8215f8f996714e1d8bff13c7762..d77dee242faa5d877d214a900255d9842273a7cd 100644
--- a/third_party/WebKit/Source/platform/scheduler/base/time_domain_unittest.cc
+++ b/third_party/WebKit/Source/platform/scheduler/base/time_domain_unittest.cc
@@ -15,9 +15,9 @@
#include "platform/scheduler/base/work_queue.h"
#include "testing/gmock/include/gmock/gmock.h"
-using testing::_;
-using testing::AnyNumber;
-using testing::Mock;
+using ::testing::_;
+using ::testing::AnyNumber;
+using ::testing::Mock;
namespace blink {
namespace scheduler {
@@ -64,7 +64,7 @@ class MockTimeDomain : public TimeDomain {
DISALLOW_COPY_AND_ASSIGN(MockTimeDomain);
};
-class TimeDomainTest : public testing::Test {
+class TimeDomainTest : public ::testing::Test {
public:
void SetUp() final {
time_domain_ = base::WrapUnique(CreateMockTimeDomain());
@@ -194,7 +194,7 @@ TEST_F(TimeDomainTest, UnregisterQueue) {
EXPECT_TRUE(time_domain_->NextScheduledTaskQueue(&next_task_queue));
EXPECT_EQ(task_queue_.get(), next_task_queue);
- testing::Mock::VerifyAndClearExpectations(time_domain_.get());
+ ::testing::Mock::VerifyAndClearExpectations(time_domain_.get());
EXPECT_CALL(*time_domain_.get(), CancelWakeUpAt(wake_up1)).Times(1);
EXPECT_CALL(*time_domain_.get(), RequestWakeUpAt(_, wake_up2)).Times(1);
@@ -204,7 +204,7 @@ TEST_F(TimeDomainTest, UnregisterQueue) {
EXPECT_TRUE(time_domain_->NextScheduledTaskQueue(&next_task_queue));
EXPECT_EQ(task_queue2_.get(), next_task_queue);
- testing::Mock::VerifyAndClearExpectations(time_domain_.get());
+ ::testing::Mock::VerifyAndClearExpectations(time_domain_.get());
EXPECT_CALL(*time_domain_.get(), CancelWakeUpAt(wake_up2)).Times(1);

Powered by Google App Engine
This is Rietveld 408576698