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

Unified Diff: third_party/WebKit/Source/modules/websockets/DOMWebSocketTest.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/DOMWebSocketTest.cpp
diff --git a/third_party/WebKit/Source/modules/websockets/DOMWebSocketTest.cpp b/third_party/WebKit/Source/modules/websockets/DOMWebSocketTest.cpp
index 9a28f7673f54aa35fbf80ef50c5e2b39a958000a..0e1df756010dbba3b19ef55326b0d3f6fdd16ae9 100644
--- a/third_party/WebKit/Source/modules/websockets/DOMWebSocketTest.cpp
+++ b/third_party/WebKit/Source/modules/websockets/DOMWebSocketTest.cpp
@@ -26,23 +26,23 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "v8/include/v8.h"
-using testing::_;
-using testing::AnyNumber;
-using testing::InSequence;
-using testing::Ref;
-using testing::Return;
+using ::testing::_;
+using ::testing::AnyNumber;
+using ::testing::InSequence;
+using ::testing::Ref;
+using ::testing::Return;
namespace blink {
namespace {
-typedef testing::StrictMock<testing::MockFunction<void(int)>>
+typedef ::testing::StrictMock<::testing::MockFunction<void(int)>>
Checkpoint; // NOLINT
class MockWebSocketChannel : public WebSocketChannel {
public:
static MockWebSocketChannel* Create() {
- return new testing::StrictMock<MockWebSocketChannel>();
+ return new ::testing::StrictMock<MockWebSocketChannel>();
}
~MockWebSocketChannel() override {}

Powered by Google App Engine
This is Rietveld 408576698