| Index: tools/android/forwarder2/daemon.h
|
| diff --git a/tools/android/forwarder2/daemon.h b/tools/android/forwarder2/daemon.h
|
| index f983a2ea65580510e416c0871587cb8af58c5402..54285df43dafc9efcb8d8c519bae12bcd755a715 100644
|
| --- a/tools/android/forwarder2/daemon.h
|
| +++ b/tools/android/forwarder2/daemon.h
|
| @@ -5,10 +5,10 @@
|
| #ifndef TOOLS_ANDROID_FORWARDER2_DAEMON_H_
|
| #define TOOLS_ANDROID_FORWARDER2_DAEMON_H_
|
|
|
| +#include <memory>
|
| #include <string>
|
|
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
|
|
| namespace forwarder2 {
|
|
|
| @@ -37,7 +37,7 @@ class Daemon {
|
| // setup signal handlers or perform global initialization.
|
| virtual void Init() = 0;
|
|
|
| - virtual void OnClientConnected(scoped_ptr<Socket> client_socket) = 0;
|
| + virtual void OnClientConnected(std::unique_ptr<Socket> client_socket) = 0;
|
| };
|
|
|
| // |identifier| should be a unique string identifier. It is used to
|
|
|