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

Unified Diff: third_party/WebKit/Source/core/dom/ScriptRunnerTest.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/ScriptRunnerTest.cpp
diff --git a/third_party/WebKit/Source/core/dom/ScriptRunnerTest.cpp b/third_party/WebKit/Source/core/dom/ScriptRunnerTest.cpp
index 6430ebbc58a835acabfa2f84c0db3a464b75ba68..a1bd764fc03cfbe1d5140bf0c1e4be008694efd9 100644
--- a/third_party/WebKit/Source/core/dom/ScriptRunnerTest.cpp
+++ b/third_party/WebKit/Source/core/dom/ScriptRunnerTest.cpp
@@ -35,7 +35,7 @@ class MockScriptLoader final : public ScriptLoader {
: ScriptLoader(MockScriptElementBase::Create(), false, false, false) {}
};
-class ScriptRunnerTest : public testing::Test {
+class ScriptRunnerTest : public ::testing::Test {
public:
ScriptRunnerTest() : document_(Document::Create()) {}
@@ -298,7 +298,7 @@ TEST_F(ScriptRunnerTest, QueueReentrantScript_ManyAsyncScripts) {
int expected[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
10, 11, 12, 13, 14, 15, 16, 17, 18, 19};
- EXPECT_THAT(order_, testing::ElementsAreArray(expected));
+ EXPECT_THAT(order_, ::testing::ElementsAreArray(expected));
}
TEST_F(ScriptRunnerTest, ResumeAndSuspend_InOrder) {

Powered by Google App Engine
This is Rietveld 408576698