diff options
| author | kmarshall <kmarshall@chromium.org> | 2015-12-04 09:59:20 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-04 17:59:59 +0000 |
| commit | c8abbce3c7f30d868796b4e710980e1cc5df49e0 (patch) | |
| tree | 8164c83979b7e91e799b2494e6a5612997cf61f4 /blimp/net | |
| parent | eb4ebda72019cc0d2373b92c62d89ddf463cb9dc (diff) | |
| download | chromium_src-c8abbce3c7f30d868796b4e710980e1cc5df49e0.zip chromium_src-c8abbce3c7f30d868796b4e710980e1cc5df49e0.tar.gz chromium_src-c8abbce3c7f30d868796b4e710980e1cc5df49e0.tar.bz2 | |
Convert remaining instances of scoped_ptr::Pass() to std::move.
R=dtrainor@chromium.org
BUG=
Review URL: https://codereview.chromium.org/1501483002
Cr-Commit-Position: refs/heads/master@{#363244}
Diffstat (limited to 'blimp/net')
| -rw-r--r-- | blimp/net/blimp_message_output_buffer.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/blimp/net/blimp_message_output_buffer.cc b/blimp/net/blimp_message_output_buffer.cc index 62cc259..c599ffa 100644 --- a/blimp/net/blimp_message_output_buffer.cc +++ b/blimp/net/blimp_message_output_buffer.cc @@ -66,7 +66,7 @@ void BlimpMessageOutputBuffer::ProcessMessage( DCHECK_GE(max_buffer_size_bytes_, current_buffer_size_bytes_); write_buffer_.push_back( - make_scoped_ptr(new BufferEntry(message.Pass(), callback))); + make_scoped_ptr(new BufferEntry(std::move(message), callback))); // Write the message if (write_buffer_.size() == 1 && output_processor_) { @@ -115,7 +115,7 @@ void BlimpMessageOutputBuffer::OnMessageCheckpoint(int64 message_id) { BlimpMessageOutputBuffer::BufferEntry::BufferEntry( scoped_ptr<BlimpMessage> message, net::CompletionCallback callback) - : message(message.Pass()), callback(callback) {} + : message(std::move(message)), callback(callback) {} BlimpMessageOutputBuffer::BufferEntry::~BufferEntry() {} @@ -131,7 +131,7 @@ void BlimpMessageOutputBuffer::WriteNextMessageIfReady() { << write_buffer_.front()->message->message_id() << ", type=" << message_to_write->type() << ")"; - output_processor_->ProcessMessage(message_to_write.Pass(), + output_processor_->ProcessMessage(std::move(message_to_write), write_complete_cb_.callback()); VLOG(3) << "Queue size: " << write_buffer_.size(); } |