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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "modules/websockets/DOMWebSocket.h" 5 #include "modules/websockets/DOMWebSocket.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "bindings/core/v8/ExceptionState.h" 9 #include "bindings/core/v8/ExceptionState.h"
10 #include "bindings/core/v8/V8BindingForCore.h" 10 #include "bindings/core/v8/V8BindingForCore.h"
11 #include "bindings/core/v8/V8BindingForTesting.h" 11 #include "bindings/core/v8/V8BindingForTesting.h"
12 #include "core/dom/DOMTypedArray.h" 12 #include "core/dom/DOMTypedArray.h"
13 #include "core/dom/Document.h" 13 #include "core/dom/Document.h"
14 #include "core/dom/ExceptionCode.h" 14 #include "core/dom/ExceptionCode.h"
15 #include "core/dom/SecurityContext.h" 15 #include "core/dom/SecurityContext.h"
16 #include "core/fileapi/Blob.h" 16 #include "core/fileapi/Blob.h"
17 #include "core/inspector/ConsoleTypes.h" 17 #include "core/inspector/ConsoleTypes.h"
18 #include "core/testing/DummyPageHolder.h" 18 #include "core/testing/DummyPageHolder.h"
19 #include "platform/heap/Handle.h" 19 #include "platform/heap/Handle.h"
20 #include "platform/wtf/Vector.h" 20 #include "platform/wtf/Vector.h"
21 #include "platform/wtf/text/CString.h" 21 #include "platform/wtf/text/CString.h"
22 #include "platform/wtf/text/StringBuilder.h" 22 #include "platform/wtf/text/StringBuilder.h"
23 #include "platform/wtf/text/WTFString.h" 23 #include "platform/wtf/text/WTFString.h"
24 #include "public/platform/WebInsecureRequestPolicy.h" 24 #include "public/platform/WebInsecureRequestPolicy.h"
25 #include "testing/gmock/include/gmock/gmock.h" 25 #include "testing/gmock/include/gmock/gmock.h"
26 #include "testing/gtest/include/gtest/gtest.h" 26 #include "testing/gtest/include/gtest/gtest.h"
27 #include "v8/include/v8.h" 27 #include "v8/include/v8.h"
28 28
29 using testing::_; 29 using ::testing::_;
30 using testing::AnyNumber; 30 using ::testing::AnyNumber;
31 using testing::InSequence; 31 using ::testing::InSequence;
32 using testing::Ref; 32 using ::testing::Ref;
33 using testing::Return; 33 using ::testing::Return;
34 34
35 namespace blink { 35 namespace blink {
36 36
37 namespace { 37 namespace {
38 38
39 typedef testing::StrictMock<testing::MockFunction<void(int)>> 39 typedef ::testing::StrictMock<::testing::MockFunction<void(int)>>
40 Checkpoint; // NOLINT 40 Checkpoint; // NOLINT
41 41
42 class MockWebSocketChannel : public WebSocketChannel { 42 class MockWebSocketChannel : public WebSocketChannel {
43 public: 43 public:
44 static MockWebSocketChannel* Create() { 44 static MockWebSocketChannel* Create() {
45 return new testing::StrictMock<MockWebSocketChannel>(); 45 return new ::testing::StrictMock<MockWebSocketChannel>();
46 } 46 }
47 47
48 ~MockWebSocketChannel() override {} 48 ~MockWebSocketChannel() override {}
49 49
50 MOCK_METHOD2(Connect, bool(const KURL&, const String&)); 50 MOCK_METHOD2(Connect, bool(const KURL&, const String&));
51 MOCK_METHOD1(Send, void(const CString&)); 51 MOCK_METHOD1(Send, void(const CString&));
52 MOCK_METHOD3(Send, void(const DOMArrayBuffer&, unsigned, unsigned)); 52 MOCK_METHOD3(Send, void(const DOMArrayBuffer&, unsigned, unsigned));
53 MOCK_METHOD1(SendMock, void(BlobDataHandle*)); 53 MOCK_METHOD1(SendMock, void(BlobDataHandle*));
54 void Send(PassRefPtr<BlobDataHandle> handle) { SendMock(handle.Get()); } 54 void Send(PassRefPtr<BlobDataHandle> handle) { SendMock(handle.Get()); }
55 MOCK_METHOD1(SendTextAsCharVectorMock, void(Vector<char>*)); 55 MOCK_METHOD1(SendTextAsCharVectorMock, void(Vector<char>*));
(...skipping 828 matching lines...) Expand 10 before | Expand all | Expand 10 after
884 } 884 }
885 885
886 INSTANTIATE_TEST_CASE_P( 886 INSTANTIATE_TEST_CASE_P(
887 DOMWebSocketInvalidClosingCode, 887 DOMWebSocketInvalidClosingCode,
888 DOMWebSocketInvalidClosingCodeTest, 888 DOMWebSocketInvalidClosingCodeTest,
889 ::testing::Values(0, 1, 998, 999, 1001, 2999, 5000, 9999, 65535)); 889 ::testing::Values(0, 1, 998, 999, 1001, 2999, 5000, 9999, 65535));
890 890
891 } // namespace 891 } // namespace
892 892
893 } // namespace blink 893 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698