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

Side by Side Diff: tools/android/forwarder2/forwarder.cc

Issue 1869503004: Convert //tools to use std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase, change iwyu fixes for converted directories to include <memory> Created 4 years, 8 months 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
« no previous file with comments | « tools/android/forwarder2/forwarder.h ('k') | tools/android/forwarder2/forwarders_manager.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "tools/android/forwarder2/forwarder.h" 5 #include "tools/android/forwarder2/forwarder.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 216
217 int bytes_read_; 217 int bytes_read_;
218 int write_offset_; 218 int write_offset_;
219 BufferedCopier* peer_; 219 BufferedCopier* peer_;
220 State state_; 220 State state_;
221 char buffer_[kBufferSize]; 221 char buffer_[kBufferSize];
222 222
223 DISALLOW_COPY_AND_ASSIGN(BufferedCopier); 223 DISALLOW_COPY_AND_ASSIGN(BufferedCopier);
224 }; 224 };
225 225
226 Forwarder::Forwarder(scoped_ptr<Socket> socket1, scoped_ptr<Socket> socket2) 226 Forwarder::Forwarder(std::unique_ptr<Socket> socket1,
227 std::unique_ptr<Socket> socket2)
227 : socket1_(std::move(socket1)), 228 : socket1_(std::move(socket1)),
228 socket2_(std::move(socket2)), 229 socket2_(std::move(socket2)),
229 buffer1_(new BufferedCopier(socket1_.get(), socket2_.get())), 230 buffer1_(new BufferedCopier(socket1_.get(), socket2_.get())),
230 buffer2_(new BufferedCopier(socket2_.get(), socket1_.get())) { 231 buffer2_(new BufferedCopier(socket2_.get(), socket1_.get())) {
231 buffer1_->SetPeer(buffer2_.get()); 232 buffer1_->SetPeer(buffer2_.get());
232 buffer2_->SetPeer(buffer1_.get()); 233 buffer2_->SetPeer(buffer1_.get());
233 } 234 }
234 235
235 Forwarder::~Forwarder() { 236 Forwarder::~Forwarder() {
236 DCHECK(thread_checker_.CalledOnValidThread()); 237 DCHECK(thread_checker_.CalledOnValidThread());
(...skipping 16 matching lines...) Expand all
253 return buffer1_->is_closed() && buffer2_->is_closed(); 254 return buffer1_->is_closed() && buffer2_->is_closed();
254 } 255 }
255 256
256 void Forwarder::Shutdown() { 257 void Forwarder::Shutdown() {
257 DCHECK(thread_checker_.CalledOnValidThread()); 258 DCHECK(thread_checker_.CalledOnValidThread());
258 buffer1_->Close(); 259 buffer1_->Close();
259 buffer2_->Close(); 260 buffer2_->Close();
260 } 261 }
261 262
262 } // namespace forwarder2 263 } // namespace forwarder2
OLDNEW
« no previous file with comments | « tools/android/forwarder2/forwarder.h ('k') | tools/android/forwarder2/forwarders_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698