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

Unified Diff: third_party/WebKit/Source/modules/websockets/DocumentWebSocketChannelTest.cpp

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/modules/websockets/DocumentWebSocketChannelTest.cpp
diff --git a/third_party/WebKit/Source/modules/websockets/DocumentWebSocketChannelTest.cpp b/third_party/WebKit/Source/modules/websockets/DocumentWebSocketChannelTest.cpp
index bdcb50b4416a05694e5a1a71e5c9146467539262..d83766d118da5bb65dc498a19aadf2995793955d 100644
--- a/third_party/WebKit/Source/modules/websockets/DocumentWebSocketChannelTest.cpp
+++ b/third_party/WebKit/Source/modules/websockets/DocumentWebSocketChannelTest.cpp
@@ -26,17 +26,17 @@
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
-using testing::_;
-using testing::InSequence;
-using testing::PrintToString;
-using testing::AnyNumber;
-using testing::SaveArg;
+using ::testing::_;
+using ::testing::InSequence;
+using ::testing::PrintToString;
+using ::testing::AnyNumber;
+using ::testing::SaveArg;
namespace blink {
namespace {
-typedef testing::StrictMock<testing::MockFunction<void(int)>> Checkpoint;
+typedef ::testing::StrictMock<::testing::MockFunction<void(int)>> Checkpoint;
class MockWebSocketChannelClient
: public GarbageCollectedFinalized<MockWebSocketChannelClient>,
@@ -45,7 +45,7 @@ class MockWebSocketChannelClient
public:
static MockWebSocketChannelClient* Create() {
- return new testing::StrictMock<MockWebSocketChannelClient>();
+ return new ::testing::StrictMock<MockWebSocketChannelClient>();
}
MockWebSocketChannelClient() {}
@@ -72,7 +72,7 @@ class MockWebSocketChannelClient
class MockWebSocketHandle : public WebSocketHandle {
public:
static MockWebSocketHandle* Create() {
- return new testing::StrictMock<MockWebSocketHandle>();
+ return new ::testing::StrictMock<MockWebSocketHandle>();
}
MockWebSocketHandle() {}
@@ -100,7 +100,7 @@ class MockWebSocketHandle : public WebSocketHandle {
class MockWebSocketHandshakeThrottle : public WebSocketHandshakeThrottle {
public:
static MockWebSocketHandshakeThrottle* Create() {
- return new testing::StrictMock<MockWebSocketHandshakeThrottle>();
+ return new ::testing::StrictMock<MockWebSocketHandshakeThrottle>();
}
MockWebSocketHandshakeThrottle() {}
~MockWebSocketHandshakeThrottle() override { Destructor(); }
« no previous file with comments | « third_party/WebKit/Source/modules/websockets/DOMWebSocketTest.cpp ('k') | third_party/WebKit/Source/platform/PODArenaTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698