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

Side by Side Diff: net/websockets/websocket_deflate_stream_test.cc

Issue 474973004: Remove implicit conversions from scoped_refptr to T* in net/websockets/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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 "net/websockets/websocket_deflate_stream.h" 5 #include "net/websockets/websocket_deflate_stream.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 #include <deque> 8 #include <deque>
9 #include <string> 9 #include <string>
10 10
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 61
62 std::string ToString(IOBuffer* buffer, size_t size) { 62 std::string ToString(IOBuffer* buffer, size_t size) {
63 return std::string(buffer->data(), size); 63 return std::string(buffer->data(), size);
64 } 64 }
65 65
66 std::string ToString(const scoped_refptr<IOBuffer>& buffer, size_t size) { 66 std::string ToString(const scoped_refptr<IOBuffer>& buffer, size_t size) {
67 return ToString(buffer.get(), size); 67 return ToString(buffer.get(), size);
68 } 68 }
69 69
70 std::string ToString(const WebSocketFrame* frame) { 70 std::string ToString(const WebSocketFrame* frame) {
71 return frame->data ? ToString(frame->data, frame->header.payload_length) : ""; 71 return frame->data.get() ? ToString(frame->data, frame->header.payload_length)
72 : "";
72 } 73 }
73 74
74 void AppendTo(ScopedVector<WebSocketFrame>* frames, 75 void AppendTo(ScopedVector<WebSocketFrame>* frames,
75 WebSocketFrameHeader::OpCode opcode, 76 WebSocketFrameHeader::OpCode opcode,
76 FrameFlag flag, 77 FrameFlag flag,
77 const std::string& data) { 78 const std::string& data) {
78 scoped_ptr<WebSocketFrame> frame(new WebSocketFrame(opcode)); 79 scoped_ptr<WebSocketFrame> frame(new WebSocketFrame(opcode));
79 frame->header.final = (flag & kFinal); 80 frame->header.final = (flag & kFinal);
80 frame->header.reserved1 = (flag & kReserved1); 81 frame->header.reserved1 = (flag & kReserved1);
81 frame->data = ToIOBuffer(data); 82 frame->data = ToIOBuffer(data);
(...skipping 1257 matching lines...) Expand 10 before | Expand all | Expand 10 after
1339 const ScopedVector<WebSocketFrame>& frames_passed = *stub.frames(); 1340 const ScopedVector<WebSocketFrame>& frames_passed = *stub.frames();
1340 ASSERT_EQ(1u, frames_passed.size()); 1341 ASSERT_EQ(1u, frames_passed.size());
1341 EXPECT_EQ( 1342 EXPECT_EQ(
1342 std::string("r\xce(\xca\xcf\xcd,\xcdM\x1c\xe1\xc0\x19\x1a\x0e\0\0", 17), 1343 std::string("r\xce(\xca\xcf\xcd,\xcdM\x1c\xe1\xc0\x19\x1a\x0e\0\0", 17),
1343 ToString(frames_passed[0])); 1344 ToString(frames_passed[0]));
1344 } 1345 }
1345 1346
1346 } // namespace 1347 } // namespace
1347 1348
1348 } // namespace net 1349 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698