| Index: net/websockets/websocket_frame_parser.cc
|
| diff --git a/net/websockets/websocket_frame_parser.cc b/net/websockets/websocket_frame_parser.cc
|
| index 51581e91e5e06e7e1f979376eebe65c44c115a31..7c2a075eadaec1d06c5c65a72b3937b8715a0781 100644
|
| --- a/net/websockets/websocket_frame_parser.cc
|
| +++ b/net/websockets/websocket_frame_parser.cc
|
| @@ -6,6 +6,7 @@
|
|
|
| #include <algorithm>
|
| #include <limits>
|
| +#include <utility>
|
| #include <vector>
|
|
|
| #include "base/big_endian.h"
|
| @@ -71,7 +72,7 @@ bool WebSocketFrameParser::Decode(
|
| scoped_ptr<WebSocketFrameChunk> frame_chunk =
|
| DecodeFramePayload(first_chunk);
|
| DCHECK(frame_chunk.get());
|
| - frame_chunks->push_back(frame_chunk.Pass());
|
| + frame_chunks->push_back(std::move(frame_chunk));
|
|
|
| if (current_frame_header_.get()) {
|
| DCHECK(current_read_pos_ == buffer_.size());
|
| @@ -203,7 +204,7 @@ scoped_ptr<WebSocketFrameChunk> WebSocketFrameParser::DecodeFramePayload(
|
| frame_offset_ = 0;
|
| }
|
|
|
| - return frame_chunk.Pass();
|
| + return frame_chunk;
|
| }
|
|
|
| } // namespace net
|
|
|