From b206dc41dad7f97d6fe6fad6b4a4cbcc65ab0672 Mon Sep 17 00:00:00 2001 From: dcheng Date: Tue, 26 Aug 2014 12:46:23 -0700 Subject: [PATCH] Remove implicit conversions from scoped_refptr to T* in net/websockets/ This patch was generated by running the rewrite_scoped_refptr clang tool on a Linux build. BUG=110610 Review URL: https://codereview.chromium.org/474973004 Cr-Commit-Position: refs/heads/master@{#291970} --- net/websockets/websocket_basic_stream.cc | 16 ++++++++-------- net/websockets/websocket_basic_stream_test.cc | 4 ++-- net/websockets/websocket_channel.cc | 4 ++-- net/websockets/websocket_channel_test.cc | 4 ++-- net/websockets/websocket_deflate_stream.cc | 16 +++++++++------- net/websockets/websocket_deflate_stream_test.cc | 3 ++- net/websockets/websocket_inflater_test.cc | 20 ++++++++++---------- net/websockets/websocket_job_test.cc | 4 ++-- net/websockets/websocket_stream.cc | 2 +- net/websockets/websocket_stream_test.cc | 6 +++--- 10 files changed, 41 insertions(+), 38 deletions(-) diff --git a/net/websockets/websocket_basic_stream.cc b/net/websockets/websocket_basic_stream.cc index fd2766bcb94f..af2444d834a0 100644 --- a/net/websockets/websocket_basic_stream.cc +++ b/net/websockets/websocket_basic_stream.cc @@ -79,7 +79,7 @@ WebSocketBasicStream::WebSocketBasicStream( extensions_(extensions), generate_websocket_masking_key_(&GenerateWebSocketMaskingKey) { // http_read_buffer_ should not be set if it contains no data. - if (http_read_buffer_ && http_read_buffer_->offset() == 0) + if (http_read_buffer_.get() && http_read_buffer_->offset() == 0) http_read_buffer_ = NULL; DCHECK(connection_->is_initialized()); } @@ -91,7 +91,7 @@ int WebSocketBasicStream::ReadFrames(ScopedVector* frames, DCHECK(frames->empty()); // If there is data left over after parsing the HTTP headers, attempt to parse // it as WebSocket frames. - if (http_read_buffer_) { + if (http_read_buffer_.get()) { DCHECK_GE(http_read_buffer_->offset(), 0); // We cannot simply copy the data into read_buffer_, as it might be too // large. @@ -170,7 +170,7 @@ int WebSocketBasicStream::WriteFrames(ScopedVector* frames, DCHECK_EQ(0, remaining_size) << "Buffer size calculation was wrong; " << remaining_size << " bytes left over."; scoped_refptr drainable_buffer( - new DrainableIOBuffer(combined_buffer, total_size)); + new DrainableIOBuffer(combined_buffer.get(), total_size)); return WriteEverything(drainable_buffer, callback); } @@ -285,7 +285,7 @@ int WebSocketBasicStream::ConvertChunkToFrame( is_first_chunk = true; current_frame_header_.swap(chunk->header); } - const int chunk_size = chunk->data ? chunk->data->size() : 0; + const int chunk_size = chunk->data.get() ? chunk->data->size() : 0; DCHECK(current_frame_header_) << "Unexpected header-less chunk received " << "(final_chunk = " << chunk->final_chunk << ", data size = " << chunk_size @@ -313,7 +313,7 @@ int WebSocketBasicStream::ConvertChunkToFrame( } if (!is_final_chunk) { DVLOG(2) << "Encountered a split control frame, opcode " << opcode; - if (incomplete_control_frame_body_) { + if (incomplete_control_frame_body_.get()) { DVLOG(3) << "Appending to an existing split control frame."; AddToIncompleteControlFrameBody(data_buffer); } else { @@ -328,7 +328,7 @@ int WebSocketBasicStream::ConvertChunkToFrame( } return OK; } - if (incomplete_control_frame_body_) { + if (incomplete_control_frame_body_.get()) { DVLOG(2) << "Rejoining a split control frame, opcode " << opcode; AddToIncompleteControlFrameBody(data_buffer); const int body_size = incomplete_control_frame_body_->offset(); @@ -365,7 +365,7 @@ scoped_ptr WebSocketBasicStream::CreateFrame( scoped_ptr result_frame; const bool is_final_chunk_in_message = is_final_chunk && current_frame_header_->final; - const int data_size = data ? data->size() : 0; + const int data_size = data.get() ? data->size() : 0; const WebSocketFrameHeader::OpCode opcode = current_frame_header_->opcode; // Empty frames convey no useful information unless they are the first frame // (containing the type and flags) or have the "final" bit set. @@ -398,7 +398,7 @@ scoped_ptr WebSocketBasicStream::CreateFrame( void WebSocketBasicStream::AddToIncompleteControlFrameBody( const scoped_refptr& data_buffer) { - if (!data_buffer) + if (!data_buffer.get()) return; const int new_offset = incomplete_control_frame_body_->offset() + data_buffer->size(); diff --git a/net/websockets/websocket_basic_stream_test.cc b/net/websockets/websocket_basic_stream_test.cc index 71af0797818b..c67583d2dc91 100644 --- a/net/websockets/websocket_basic_stream_test.cc +++ b/net/websockets/websocket_basic_stream_test.cc @@ -639,7 +639,7 @@ TEST_F(WebSocketBasicStreamSocketTest, HttpReadBufferIsUsed) { EXPECT_EQ(OK, stream_->ReadFrames(&frames_, cb_.callback())); ASSERT_EQ(1U, frames_.size()); - ASSERT_TRUE(frames_[0]->data); + ASSERT_TRUE(frames_[0]->data.get()); EXPECT_EQ(GG_UINT64_C(6), frames_[0]->header.payload_length); } @@ -653,7 +653,7 @@ TEST_F(WebSocketBasicStreamSocketSingleReadTest, ASSERT_EQ(ERR_IO_PENDING, stream_->ReadFrames(&frames_, cb_.callback())); EXPECT_EQ(OK, cb_.WaitForResult()); ASSERT_EQ(1U, frames_.size()); - ASSERT_TRUE(frames_[0]->data); + ASSERT_TRUE(frames_[0]->data.get()); EXPECT_EQ(GG_UINT64_C(6), frames_[0]->header.payload_length); EXPECT_EQ(WebSocketFrameHeader::kOpCodeText, frames_[0]->header.opcode); } diff --git a/net/websockets/websocket_channel.cc b/net/websockets/websocket_channel.cc index 767d632daf2d..8c264f1313c3 100644 --- a/net/websockets/websocket_channel.cc +++ b/net/websockets/websocket_channel.cc @@ -430,8 +430,8 @@ void WebSocketChannel::SendFlowControl(int64 quota) { const size_t bytes_to_send = std::min(base::checked_cast(quota), data_size); const bool final = front.final() && data_size == bytes_to_send; - const char* data = front.data() ? - front.data()->data() + front.offset() : NULL; + const char* data = + front.data().get() ? front.data()->data() + front.offset() : NULL; DCHECK(!bytes_to_send || data) << "Non empty data should not be null."; const std::vector data_vector(data, data + bytes_to_send); DVLOG(3) << "Sending frame previously split due to quota to the " diff --git a/net/websockets/websocket_channel_test.cc b/net/websockets/websocket_channel_test.cc index 4a8f119a65b5..42c1ed6a90a9 100644 --- a/net/websockets/websocket_channel_test.cc +++ b/net/websockets/websocket_channel_test.cc @@ -59,7 +59,7 @@ std::ostream& operator<<(std::ostream& os, const WebSocketFrameHeader& header) { std::ostream& operator<<(std::ostream& os, const WebSocketFrame& frame) { os << "{" << frame.header << ", "; - if (frame.data) { + if (frame.data.get()) { return os << "\"" << base::StringPiece(frame.data->data(), frame.header.payload_length) << "\"}"; @@ -2862,7 +2862,7 @@ TEST_F(WebSocketChannelStreamTest, WrittenBinaryFramesAre8BitClean) { ASSERT_EQ(1U, frames->size()); const WebSocketFrame* out_frame = (*frames)[0]; EXPECT_EQ(kBinaryBlobSize, out_frame->header.payload_length); - ASSERT_TRUE(out_frame->data); + ASSERT_TRUE(out_frame->data.get()); EXPECT_EQ(0, memcmp(kBinaryBlob, out_frame->data->data(), kBinaryBlobSize)); } diff --git a/net/websockets/websocket_deflate_stream.cc b/net/websockets/websocket_deflate_stream.cc index 38de5fa2ecab..f3d293a273f0 100644 --- a/net/websockets/websocket_deflate_stream.cc +++ b/net/websockets/websocket_deflate_stream.cc @@ -132,8 +132,9 @@ int WebSocketDeflateStream::Deflate(ScopedVector* frames) { frames_to_write.push_back(frame.release()); current_writing_opcode_ = WebSocketFrameHeader::kOpCodeContinuation; } else { - if (frame->data && !deflater_.AddBytes(frame->data->data(), - frame->header.payload_length)) { + if (frame->data.get() && + !deflater_.AddBytes(frame->data->data(), + frame->header.payload_length)) { DVLOG(1) << "WebSocket protocol error. " << "deflater_.AddBytes() returns an error."; return ERR_WS_PROTOCOL_ERROR; @@ -202,7 +203,7 @@ int WebSocketDeflateStream::AppendCompressedFrame( const WebSocketFrameHeader::OpCode opcode = current_writing_opcode_; scoped_refptr compressed_payload = deflater_.GetOutput(deflater_.CurrentOutputSize()); - if (!compressed_payload) { + if (!compressed_payload.get()) { DVLOG(1) << "WebSocket protocol error. " << "deflater_.GetOutput() returns an error."; return ERR_WS_PROTOCOL_ERROR; @@ -230,7 +231,7 @@ int WebSocketDeflateStream::AppendPossiblyCompressedMessage( const WebSocketFrameHeader::OpCode opcode = current_writing_opcode_; scoped_refptr compressed_payload = deflater_.GetOutput(deflater_.CurrentOutputSize()); - if (!compressed_payload) { + if (!compressed_payload.get()) { DVLOG(1) << "WebSocket protocol error. " << "deflater_.GetOutput() returns an error."; return ERR_WS_PROTOCOL_ERROR; @@ -310,8 +311,9 @@ int WebSocketDeflateStream::Inflate(ScopedVector* frames) { frames_to_output.push_back(frame.release()); } else { DCHECK_EQ(reading_state_, READING_COMPRESSED_MESSAGE); - if (frame->data && !inflater_.AddBytes(frame->data->data(), - frame->header.payload_length)) { + if (frame->data.get() && + !inflater_.AddBytes(frame->data->data(), + frame->header.payload_length)) { DVLOG(1) << "WebSocket protocol error. " << "inflater_.AddBytes() returns an error."; return ERR_WS_PROTOCOL_ERROR; @@ -334,7 +336,7 @@ int WebSocketDeflateStream::Inflate(ScopedVector* frames) { new WebSocketFrame(WebSocketFrameHeader::kOpCodeText)); scoped_refptr data = inflater_.GetOutput(size); bool is_final = !inflater_.CurrentOutputSize() && frame->header.final; - if (!data) { + if (!data.get()) { DVLOG(1) << "WebSocket protocol error. " << "inflater_.GetOutput() returns an error."; return ERR_WS_PROTOCOL_ERROR; diff --git a/net/websockets/websocket_deflate_stream_test.cc b/net/websockets/websocket_deflate_stream_test.cc index a8b4e59c32b1..590f616d553c 100644 --- a/net/websockets/websocket_deflate_stream_test.cc +++ b/net/websockets/websocket_deflate_stream_test.cc @@ -68,7 +68,8 @@ std::string ToString(const scoped_refptr& buffer, size_t size) { } std::string ToString(const WebSocketFrame* frame) { - return frame->data ? ToString(frame->data, frame->header.payload_length) : ""; + return frame->data.get() ? ToString(frame->data, frame->header.payload_length) + : ""; } void AppendTo(ScopedVector* frames, diff --git a/net/websockets/websocket_inflater_test.cc b/net/websockets/websocket_inflater_test.cc index 139e90112b7f..5b6df4167c21 100644 --- a/net/websockets/websocket_inflater_test.cc +++ b/net/websockets/websocket_inflater_test.cc @@ -37,14 +37,14 @@ TEST(WebSocketInflaterTest, InflateHelloTakeOverContext) { ASSERT_TRUE(inflater.AddBytes("\xf2\x48\xcd\xc9\xc9\x07\x00", 7)); ASSERT_TRUE(inflater.Finish()); actual1 = inflater.GetOutput(inflater.CurrentOutputSize()); - ASSERT_TRUE(actual1); + ASSERT_TRUE(actual1.get()); EXPECT_EQ("Hello", ToString(actual1.get())); EXPECT_EQ(0u, inflater.CurrentOutputSize()); ASSERT_TRUE(inflater.AddBytes("\xf2\x00\x11\x00\x00", 5)); ASSERT_TRUE(inflater.Finish()); actual2 = inflater.GetOutput(inflater.CurrentOutputSize()); - ASSERT_TRUE(actual2); + ASSERT_TRUE(actual2.get()); EXPECT_EQ("Hello", ToString(actual2.get())); EXPECT_EQ(0u, inflater.CurrentOutputSize()); } @@ -59,7 +59,7 @@ TEST(WebSocketInflaterTest, InflateHelloSmallCapacity) { for (size_t i = 0; i < 5; ++i) { ASSERT_EQ(1u, inflater.CurrentOutputSize()); scoped_refptr buffer = inflater.GetOutput(1); - ASSERT_TRUE(buffer); + ASSERT_TRUE(buffer.get()); ASSERT_EQ(1, buffer->size()); actual += ToString(buffer.get()); } @@ -76,7 +76,7 @@ TEST(WebSocketInflaterTest, InflateHelloSmallCapacityGetTotalOutput) { ASSERT_TRUE(inflater.Finish()); ASSERT_EQ(1u, inflater.CurrentOutputSize()); actual = inflater.GetOutput(1024); - EXPECT_EQ("Hello", ToString(actual)); + EXPECT_EQ("Hello", ToString(actual.get())); EXPECT_EQ(0u, inflater.CurrentOutputSize()); } @@ -107,7 +107,7 @@ TEST(WebSocketInflaterTest, MultipleAddBytesCalls) { } ASSERT_TRUE(inflater.Finish()); actual = inflater.GetOutput(5); - ASSERT_TRUE(actual); + ASSERT_TRUE(actual.get()); EXPECT_EQ("Hello", ToString(actual.get())); } @@ -119,7 +119,7 @@ TEST(WebSocketInflaterTest, Reset) { ASSERT_TRUE(inflater.AddBytes("\xf2\x48\xcd\xc9\xc9\x07\x00", 7)); ASSERT_TRUE(inflater.Finish()); actual1 = inflater.GetOutput(inflater.CurrentOutputSize()); - ASSERT_TRUE(actual1); + ASSERT_TRUE(actual1.get()); EXPECT_EQ("Hello", ToString(actual1.get())); EXPECT_EQ(0u, inflater.CurrentOutputSize()); @@ -131,7 +131,7 @@ TEST(WebSocketInflaterTest, Reset) { ASSERT_TRUE(inflater.AddBytes("\xf2\x48\xcd\xc9\xc9\x07\x00", 7)); ASSERT_TRUE(inflater.Finish()); actual2 = inflater.GetOutput(inflater.CurrentOutputSize()); - ASSERT_TRUE(actual2); + ASSERT_TRUE(actual2.get()); EXPECT_EQ("Hello", ToString(actual2.get())); EXPECT_EQ(0u, inflater.CurrentOutputSize()); } @@ -144,7 +144,7 @@ TEST(WebSocketInflaterTest, ResetAndLostContext) { ASSERT_TRUE(inflater.AddBytes("\xf2\x48\xcd\xc9\xc9\x07\x00", 7)); ASSERT_TRUE(inflater.Finish()); actual1 = inflater.GetOutput(inflater.CurrentOutputSize()); - ASSERT_TRUE(actual1); + ASSERT_TRUE(actual1.get()); EXPECT_EQ("Hello", ToString(actual1.get())); EXPECT_EQ(0u, inflater.CurrentOutputSize()); @@ -201,7 +201,7 @@ TEST(WebSocketInflaterTest, LargeRandomDeflateInflate) { compressed = deflater.GetOutput(deflater.CurrentOutputSize()); - ASSERT_TRUE(compressed); + ASSERT_TRUE(compressed.get()); ASSERT_EQ(0u, deflater.CurrentOutputSize()); ASSERT_TRUE(inflater.AddBytes(compressed->data(), compressed->size())); @@ -210,7 +210,7 @@ TEST(WebSocketInflaterTest, LargeRandomDeflateInflate) { while (inflater.CurrentOutputSize() > 0) { scoped_refptr uncompressed = inflater.GetOutput(inflater.CurrentOutputSize()); - ASSERT_TRUE(uncompressed); + ASSERT_TRUE(uncompressed.get()); output.insert(output.end(), uncompressed->data(), uncompressed->data() + uncompressed->size()); diff --git a/net/websockets/websocket_job_test.cc b/net/websockets/websocket_job_test.cc index 739245c384d6..59d529ae13fb 100644 --- a/net/websockets/websocket_job_test.cc +++ b/net/websockets/websocket_job_test.cc @@ -1105,9 +1105,9 @@ void WebSocketJobTest::TestThrottlingLimit() { scoped_refptr job = new WebSocketJob(NULL); job->addresses_ = AddressList(AddressList::CreateFromIPAddress(ip, 80)); if (i >= kMaxWebSocketJobsThrottled) - EXPECT_FALSE(WebSocketThrottle::GetInstance()->PutInQueue(job)); + EXPECT_FALSE(WebSocketThrottle::GetInstance()->PutInQueue(job.get())); else - EXPECT_TRUE(WebSocketThrottle::GetInstance()->PutInQueue(job)); + EXPECT_TRUE(WebSocketThrottle::GetInstance()->PutInQueue(job.get())); jobs.push_back(job); } diff --git a/net/websockets/websocket_stream.cc b/net/websockets/websocket_stream.cc index b60963232b68..1bd6640ed3fb 100644 --- a/net/websockets/websocket_stream.cc +++ b/net/websockets/websocket_stream.cc @@ -314,7 +314,7 @@ void WebSocketDispatchOnFinishOpeningHandshake( const scoped_refptr& headers, base::Time response_time) { DCHECK(connect_delegate); - if (headers) { + if (headers.get()) { connect_delegate->OnFinishOpeningHandshake(make_scoped_ptr( new WebSocketHandshakeResponseInfo(url, headers->response_code(), diff --git a/net/websockets/websocket_stream_test.cc b/net/websockets/websocket_stream_test.cc index 653e367b36ac..5526741deb13 100644 --- a/net/websockets/websocket_stream_test.cc +++ b/net/websockets/websocket_stream_test.cc @@ -469,7 +469,7 @@ TEST_F(WebSocketStreamCreateTest, HandshakeInfo) { request_headers[11]); std::vector response_headers = - ToVector(*response_info_->headers); + ToVector(*response_info_->headers.get()); ASSERT_EQ(6u, response_headers.size()); // Sort the headers for ease of verification. std::sort(response_headers.begin(), response_headers.end()); @@ -1203,7 +1203,7 @@ TEST_F(WebSocketStreamCreateTest, SelfSignedCertificateFailure) { new SSLSocketDataProvider(ASYNC, ERR_CERT_AUTHORITY_INVALID)); ssl_data_[0]->cert = ImportCertFromFile(GetTestCertsDirectory(), "unittest.selfsigned.der"); - ASSERT_TRUE(ssl_data_[0]->cert); + ASSERT_TRUE(ssl_data_[0]->cert.get()); scoped_ptr raw_socket_data(BuildNullSocketData()); CreateAndConnectRawExpectations("wss://localhost/", NoSubProtocols(), @@ -1223,7 +1223,7 @@ TEST_F(WebSocketStreamCreateTest, SelfSignedCertificateSuccess) { new SSLSocketDataProvider(ASYNC, ERR_CERT_AUTHORITY_INVALID)); ssl_data->cert = ImportCertFromFile(GetTestCertsDirectory(), "unittest.selfsigned.der"); - ASSERT_TRUE(ssl_data->cert); + ASSERT_TRUE(ssl_data->cert.get()); ssl_data_.push_back(ssl_data.release()); ssl_data.reset(new SSLSocketDataProvider(ASYNC, OK)); ssl_data_.push_back(ssl_data.release()); -- 2.11.4.GIT