Index: net/websockets/websocket_deflate_stream.cc |
diff --git a/net/websockets/websocket_deflate_stream.cc b/net/websockets/websocket_deflate_stream.cc |
index 8eae497796a12f67078d2549430a4e0c22a44ece..798d9b7d4625fa42e8aeaf174ff134741f9c942f 100644 |
--- a/net/websockets/websocket_deflate_stream.cc |
+++ b/net/websockets/websocket_deflate_stream.cc |
@@ -40,14 +40,14 @@ WebSocketDeflateStream::WebSocketDeflateStream( |
scoped_ptr<WebSocketStream> stream, |
const WebSocketDeflateParameters& params, |
scoped_ptr<WebSocketDeflatePredictor> predictor) |
- : stream_(stream.Pass()), |
+ : stream_(std::move(stream)), |
deflater_(params.client_context_take_over_mode()), |
inflater_(kChunkSize, kChunkSize), |
reading_state_(NOT_READING), |
writing_state_(NOT_WRITING), |
current_reading_opcode_(WebSocketFrameHeader::kOpCodeText), |
current_writing_opcode_(WebSocketFrameHeader::kOpCodeText), |
- predictor_(predictor.Pass()) { |
+ predictor_(std::move(predictor)) { |
DCHECK(stream_); |
DCHECK(params.IsValidAsResponse()); |
int client_max_window_bits = 15; |
@@ -136,7 +136,7 @@ int WebSocketDeflateStream::Deflate( |
if (frame->header.final) |
writing_state_ = NOT_WRITING; |
predictor_->RecordWrittenDataFrame(frame.get()); |
- frames_to_write.push_back(frame.Pass()); |
+ frames_to_write.push_back(std::move(frame)); |
current_writing_opcode_ = WebSocketFrameHeader::kOpCodeContinuation; |
} else { |
if (frame->data.get() && |
@@ -165,7 +165,7 @@ int WebSocketDeflateStream::Deflate( |
} else { |
DCHECK_EQ(WRITING_POSSIBLY_COMPRESSED_MESSAGE, writing_state_); |
bool final = frame->header.final; |
- frames_of_message.push_back(frame.Pass()); |
+ frames_of_message.push_back(std::move(frame)); |
if (final) { |
int result = AppendPossiblyCompressedMessage(&frames_of_message, |
&frames_to_write); |
@@ -228,7 +228,7 @@ int WebSocketDeflateStream::AppendCompressedFrame( |
current_writing_opcode_ = WebSocketFrameHeader::kOpCodeContinuation; |
predictor_->RecordWrittenDataFrame(compressed.get()); |
- frames_to_write->push_back(compressed.Pass()); |
+ frames_to_write->push_back(std::move(compressed)); |
return OK; |
} |
@@ -277,7 +277,7 @@ int WebSocketDeflateStream::AppendPossiblyCompressedMessage( |
compressed->header.payload_length = compressed_payload->size(); |
predictor_->RecordWrittenDataFrame(compressed.get()); |
- frames_to_write->push_back(compressed.Pass()); |
+ frames_to_write->push_back(std::move(compressed)); |
return OK; |
} |
@@ -295,7 +295,7 @@ int WebSocketDeflateStream::Inflate( |
<< " payload_length=" << frame->header.payload_length; |
if (!WebSocketFrameHeader::IsKnownDataOpCode(frame->header.opcode)) { |
- frames_to_output.push_back(frame.Pass()); |
+ frames_to_output.push_back(std::move(frame)); |
continue; |
} |
@@ -317,7 +317,7 @@ int WebSocketDeflateStream::Inflate( |
if (frame->header.final) |
reading_state_ = NOT_READING; |
current_reading_opcode_ = WebSocketFrameHeader::kOpCodeContinuation; |
- frames_to_output.push_back(frame.Pass()); |
+ frames_to_output.push_back(std::move(frame)); |
} else { |
DCHECK_EQ(reading_state_, READING_COMPRESSED_MESSAGE); |
if (frame->data.get() && |
@@ -361,7 +361,7 @@ int WebSocketDeflateStream::Inflate( |
<< " final=" << inflated->header.final |
<< " reserved1=" << inflated->header.reserved1 |
<< " payload_length=" << inflated->header.payload_length; |
- frames_to_output.push_back(inflated.Pass()); |
+ frames_to_output.push_back(std::move(inflated)); |
current_reading_opcode_ = WebSocketFrameHeader::kOpCodeContinuation; |
if (is_final) |
break; |