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

Unified Diff: tools/android/forwarder2/forwarders_manager.h

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/forwarder.cc ('k') | tools/android/forwarder2/forwarders_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/android/forwarder2/forwarders_manager.h
diff --git a/tools/android/forwarder2/forwarders_manager.h b/tools/android/forwarder2/forwarders_manager.h
index 4c6dea6797622e7c39ddee204bbd6d211dfdb445..2cdafdb0b2fab22cb0aadb9b7815c07f7ea37bfc 100644
--- a/tools/android/forwarder2/forwarders_manager.h
+++ b/tools/android/forwarder2/forwarders_manager.h
@@ -5,7 +5,8 @@
#ifndef TOOLS_ANDROID_FORWARDER2_FORWARDERS_MANAGER_H_
#define TOOLS_ANDROID_FORWARDER2_FORWARDERS_MANAGER_H_
-#include "base/memory/scoped_ptr.h"
+#include <memory>
+
#include "base/memory/scoped_vector.h"
#include "base/threading/thread.h"
#include "tools/android/forwarder2/pipe_notifier.h"
@@ -24,12 +25,12 @@ class ForwardersManager {
~ForwardersManager();
// Can be called on any thread.
- void CreateAndStartNewForwarder(scoped_ptr<Socket> socket1,
- scoped_ptr<Socket> socket2);
+ void CreateAndStartNewForwarder(std::unique_ptr<Socket> socket1,
+ std::unique_ptr<Socket> socket2);
private:
- void CreateNewForwarderOnInternalThread(scoped_ptr<Socket> socket1,
- scoped_ptr<Socket> socket2);
+ void CreateNewForwarderOnInternalThread(std::unique_ptr<Socket> socket1,
+ std::unique_ptr<Socket> socket2);
void WaitForEventsOnInternalThreadSoon();
void WaitForEventsOnInternalThread();
« no previous file with comments | « tools/android/forwarder2/forwarder.cc ('k') | tools/android/forwarder2/forwarders_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698