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

Side by Side Diff: content/browser/websockets/websocket_manager_unittest.cc

Issue 2607063002: Remove mojo::Array. (Closed)
Patch Set: Created 3 years, 11 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 <algorithm> 5 #include <algorithm>
6 #include <memory> 6 #include <memory>
7 #include <vector> 7 #include <vector>
8 8
9 #include "content/browser/websockets/websocket_manager.h" 9 #include "content/browser/websockets/websocket_manager.h"
10 #include "content/public/test/test_browser_thread_bundle.h" 10 #include "content/public/test/test_browser_thread_bundle.h"
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 128
129 EXPECT_EQ(1U, websocket_manager()->sockets().size()); 129 EXPECT_EQ(1U, websocket_manager()->sockets().size());
130 } 130 }
131 131
132 TEST_F(WebSocketManagerTest, SendFrameButNotConnectedYet) { 132 TEST_F(WebSocketManagerTest, SendFrameButNotConnectedYet) {
133 blink::mojom::WebSocketPtr websocket; 133 blink::mojom::WebSocketPtr websocket;
134 134
135 websocket_manager()->DoCreateWebSocket(mojo::MakeRequest(&websocket)); 135 websocket_manager()->DoCreateWebSocket(mojo::MakeRequest(&websocket));
136 136
137 // This should not crash. 137 // This should not crash.
138 mojo::Array<uint8_t> data; 138 std::vector<uint8_t> data;
139 websocket->SendFrame( 139 websocket->SendFrame(
140 true, blink::mojom::WebSocketMessageType::TEXT, std::move(data)); 140 true, blink::mojom::WebSocketMessageType::TEXT, std::move(data));
yzshen1 2017/01/06 19:38:37 nit: it doesn't need std::move here. the parameter
Sam McNally 2017/01/09 23:15:15 Done.
141 } 141 }
142 142
143 TEST_F(WebSocketManagerTest, DelayFor4thPendingConnectionIsZero) { 143 TEST_F(WebSocketManagerTest, DelayFor4thPendingConnectionIsZero) {
144 AddMultipleChannels(4); 144 AddMultipleChannels(4);
145 145
146 EXPECT_EQ(4, websocket_manager()->num_pending_connections()); 146 EXPECT_EQ(4, websocket_manager()->num_pending_connections());
147 EXPECT_EQ(0, websocket_manager()->num_failed_connections()); 147 EXPECT_EQ(0, websocket_manager()->num_failed_connections());
148 EXPECT_EQ(0, websocket_manager()->num_succeeded_connections()); 148 EXPECT_EQ(0, websocket_manager()->num_succeeded_connections());
149 149
150 ASSERT_EQ(4U, websocket_manager()->sockets().size()); 150 ASSERT_EQ(4U, websocket_manager()->sockets().size());
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 239
240 AddMultipleChannels(1); 240 AddMultipleChannels(1);
241 241
242 EXPECT_EQ(1, websocket_manager()->num_pending_connections()); 242 EXPECT_EQ(1, websocket_manager()->num_pending_connections());
243 EXPECT_EQ(255, websocket_manager()->num_failed_connections()); 243 EXPECT_EQ(255, websocket_manager()->num_failed_connections());
244 EXPECT_EQ(0, websocket_manager()->num_succeeded_connections()); 244 EXPECT_EQ(0, websocket_manager()->num_succeeded_connections());
245 } 245 }
246 246
247 } // namespace 247 } // namespace
248 } // namespace content 248 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698