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

Unified Diff: third_party/WebKit/Source/core/events/TouchEventTest.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/events/TouchEventTest.cpp
diff --git a/third_party/WebKit/Source/core/events/TouchEventTest.cpp b/third_party/WebKit/Source/core/events/TouchEventTest.cpp
index 020e218bc7453516a899840e4736058e86c0ea7e..23801e6fc6901d1c07642a3397df96ba7c90477b 100644
--- a/third_party/WebKit/Source/core/events/TouchEventTest.cpp
+++ b/third_party/WebKit/Source/core/events/TouchEventTest.cpp
@@ -11,7 +11,7 @@
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
-using testing::ElementsAre;
+using ::testing::ElementsAre;
namespace blink {
@@ -42,7 +42,7 @@ class ConsoleCapturingChromeClient : public EmptyChromeClient {
std::vector<MessageSource> message_sources_;
};
-class TouchEventTest : public testing::Test {
+class TouchEventTest : public ::testing::Test {
public:
TouchEventTest() {
chrome_client_ = new ConsoleCapturingChromeClient();
@@ -133,7 +133,7 @@ TEST_F(TouchEventTest,
EXPECT_THAT(MessageSources(), ElementsAre(kInterventionMessageSource));
}
-class TouchEventTestNoFrame : public testing::Test {};
+class TouchEventTestNoFrame : public ::testing::Test {};
TEST_F(TouchEventTestNoFrame, PreventDefaultDoesntRequireFrame) {
TouchEvent::Create()->preventDefault();
« no previous file with comments | « third_party/WebKit/Source/core/editing/KeyboardTest.cpp ('k') | third_party/WebKit/Source/core/exported/WebElementTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698