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

Unified Diff: tools/android/forwarder2/forwarders_manager.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tools/android/forwarder2/forwarders_manager.h ('k') | tools/android/forwarder2/host_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/android/forwarder2/forwarders_manager.cc
diff --git a/tools/android/forwarder2/forwarders_manager.cc b/tools/android/forwarder2/forwarders_manager.cc
index fb6890fe20d7086b5cb4dbf35f723b7e8e71449d..c3dd0264dfa30f57da1306a621ef985bc616ad87 100644
--- a/tools/android/forwarder2/forwarders_manager.cc
+++ b/tools/android/forwarder2/forwarders_manager.cc
@@ -31,8 +31,9 @@ ForwardersManager::~ForwardersManager() {
deletion_notifier_.Notify();
}
-void ForwardersManager::CreateAndStartNewForwarder(scoped_ptr<Socket> socket1,
- scoped_ptr<Socket> socket2) {
+void ForwardersManager::CreateAndStartNewForwarder(
+ std::unique_ptr<Socket> socket1,
+ std::unique_ptr<Socket> socket2) {
// Note that the internal Forwarder vector is populated on the internal thread
// which is the only thread from which it's accessed.
thread_.task_runner()->PostTask(
@@ -47,8 +48,8 @@ void ForwardersManager::CreateAndStartNewForwarder(scoped_ptr<Socket> socket1,
}
void ForwardersManager::CreateNewForwarderOnInternalThread(
- scoped_ptr<Socket> socket1,
- scoped_ptr<Socket> socket2) {
+ std::unique_ptr<Socket> socket1,
+ std::unique_ptr<Socket> socket2) {
DCHECK(thread_.task_runner()->RunsTasksOnCurrentThread());
forwarders_.push_back(new Forwarder(std::move(socket1), std::move(socket2)));
}
« no previous file with comments | « tools/android/forwarder2/forwarders_manager.h ('k') | tools/android/forwarder2/host_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698