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

Unified Diff: third_party/WebKit/Source/core/dom/ScriptedIdleTaskControllerTest.cpp

Issue 2970833002: Be explicit about namespace testing to not mix it with blink::testing (Closed)
Patch Set: 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/core/dom/ScriptedIdleTaskControllerTest.cpp
diff --git a/third_party/WebKit/Source/core/dom/ScriptedIdleTaskControllerTest.cpp b/third_party/WebKit/Source/core/dom/ScriptedIdleTaskControllerTest.cpp
index cfb303a6d51a52ee50ba2995336116d8957dd0ae..b3f3c446932f155e9e039d3b9c36f18bab1719e5 100644
--- a/third_party/WebKit/Source/core/dom/ScriptedIdleTaskControllerTest.cpp
+++ b/third_party/WebKit/Source/core/dom/ScriptedIdleTaskControllerTest.cpp
@@ -95,7 +95,7 @@ class MockIdleRequestCallback : public IdleRequestCallback {
} // namespace
-class ScriptedIdleTaskControllerTest : public testing::Test {
+class ScriptedIdleTaskControllerTest : public ::testing::Test {
public:
void SetUp() override { execution_context_ = new NullExecutionContext(); }
@@ -118,7 +118,7 @@ TEST_F(ScriptedIdleTaskControllerTest, RunCallback) {
EXPECT_CALL(*callback, handleEvent(testing::_));
platform->RunIdleTask();
- testing::Mock::VerifyAndClearExpectations(callback);
+ ::testing::Mock::VerifyAndClearExpectations(callback);
EXPECT_FALSE(platform->HasIdleTask());
}
@@ -135,7 +135,7 @@ TEST_F(ScriptedIdleTaskControllerTest, DontRunCallbackWhenAskedToYield) {
EXPECT_CALL(*callback, handleEvent(testing::_)).Times(0);
platform->RunIdleTask();
- testing::Mock::VerifyAndClearExpectations(callback);
+ ::testing::Mock::VerifyAndClearExpectations(callback);
// The idle task should have been reposted.
EXPECT_TRUE(platform->HasIdleTask());
« no previous file with comments | « third_party/WebKit/Source/core/dom/ScriptRunnerTest.cpp ('k') | third_party/WebKit/Source/core/dom/StaticRangeTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698