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

Side by Side Diff: remoting/protocol/message_reader.cc

Issue 1534193004: Use std::move() instead of scoped_ptr<>::Pass(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "remoting/protocol/message_reader.h" 5 #include "remoting/protocol/message_reader.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/location.h" 10 #include "base/location.h"
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 FROM_HERE, 119 FROM_HERE,
120 base::Bind(&MessageReader::RunCallback, 120 base::Bind(&MessageReader::RunCallback,
121 weak_factory_.GetWeakPtr(), 121 weak_factory_.GetWeakPtr(),
122 base::Passed(make_scoped_ptr(buffer)))); 122 base::Passed(make_scoped_ptr(buffer))));
123 } 123 }
124 } 124 }
125 125
126 void MessageReader::RunCallback(scoped_ptr<CompoundBuffer> message) { 126 void MessageReader::RunCallback(scoped_ptr<CompoundBuffer> message) {
127 if (!message_received_callback_.is_null()){ 127 if (!message_received_callback_.is_null()){
128 message_received_callback_.Run( 128 message_received_callback_.Run(
129 message.Pass(), 129 std::move(message),
130 base::Bind(&MessageReader::OnMessageDone, weak_factory_.GetWeakPtr())); 130 base::Bind(&MessageReader::OnMessageDone, weak_factory_.GetWeakPtr()));
131 } 131 }
132 } 132 }
133 133
134 void MessageReader::OnMessageDone() { 134 void MessageReader::OnMessageDone() {
135 DCHECK(CalledOnValidThread()); 135 DCHECK(CalledOnValidThread());
136 pending_messages_--; 136 pending_messages_--;
137 DCHECK_GE(pending_messages_, 0); 137 DCHECK_GE(pending_messages_, 0);
138 138
139 // Start next read if necessary. 139 // Start next read if necessary.
140 DoRead(); 140 DoRead();
141 } 141 }
142 142
143 } // namespace protocol 143 } // namespace protocol
144 } // namespace remoting 144 } // namespace remoting
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698