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

Unified Diff: tools/android/forwarder2/device_forwarder_main.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/device_controller.cc ('k') | tools/android/forwarder2/device_listener.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/android/forwarder2/device_forwarder_main.cc
diff --git a/tools/android/forwarder2/device_forwarder_main.cc b/tools/android/forwarder2/device_forwarder_main.cc
index 09790f98b5f90fc5bea5dbbd6280ba2aca233cd2..af796b3df67a52ce408c5d91b8eaf1d21296cf68 100644
--- a/tools/android/forwarder2/device_forwarder_main.cc
+++ b/tools/android/forwarder2/device_forwarder_main.cc
@@ -67,7 +67,7 @@ class ServerDelegate : public Daemon::ServerDelegate {
controller_thread_->Start();
}
- void OnClientConnected(scoped_ptr<Socket> client_socket) override {
+ void OnClientConnected(std::unique_ptr<Socket> client_socket) override {
if (initialized_) {
client_socket->WriteString("OK");
return;
@@ -80,9 +80,10 @@ class ServerDelegate : public Daemon::ServerDelegate {
}
private:
- void StartController(int exit_notifier_fd, scoped_ptr<Socket> client_socket) {
+ void StartController(int exit_notifier_fd,
+ std::unique_ptr<Socket> client_socket) {
DCHECK(!controller_.get());
- scoped_ptr<DeviceController> controller(
+ std::unique_ptr<DeviceController> controller(
DeviceController::Create(kUnixDomainSocketPath, exit_notifier_fd));
if (!controller.get()) {
client_socket->WriteString(
@@ -97,8 +98,8 @@ class ServerDelegate : public Daemon::ServerDelegate {
client_socket->Close();
}
- scoped_ptr<DeviceController> controller_;
- scoped_ptr<base::Thread> controller_thread_;
+ std::unique_ptr<DeviceController> controller_;
+ std::unique_ptr<base::Thread> controller_thread_;
bool initialized_;
};
« no previous file with comments | « tools/android/forwarder2/device_controller.cc ('k') | tools/android/forwarder2/device_listener.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698