| Index: tools/android/forwarder2/forwarder.h
|
| diff --git a/tools/android/forwarder2/forwarder.h b/tools/android/forwarder2/forwarder.h
|
| index 0be86fccf3c68ecd67db12b59c1a0abd2e22ebde..857babd109e4bb1385aba7fd0cb883494a616bfd 100644
|
| --- a/tools/android/forwarder2/forwarder.h
|
| +++ b/tools/android/forwarder2/forwarder.h
|
| @@ -7,7 +7,8 @@
|
|
|
| #include <sys/select.h>
|
|
|
| -#include "base/memory/scoped_ptr.h"
|
| +#include <memory>
|
| +
|
| #include "base/threading/thread_checker.h"
|
|
|
| namespace forwarder2 {
|
| @@ -18,7 +19,7 @@ class Socket;
|
| // that this class is not thread-safe.
|
| class Forwarder {
|
| public:
|
| - Forwarder(scoped_ptr<Socket> socket1, scoped_ptr<Socket> socket2);
|
| + Forwarder(std::unique_ptr<Socket> socket1, std::unique_ptr<Socket> socket2);
|
|
|
| ~Forwarder();
|
|
|
| @@ -34,12 +35,12 @@ class Forwarder {
|
| class BufferedCopier;
|
|
|
| base::ThreadChecker thread_checker_;
|
| - const scoped_ptr<Socket> socket1_;
|
| - const scoped_ptr<Socket> socket2_;
|
| + const std::unique_ptr<Socket> socket1_;
|
| + const std::unique_ptr<Socket> socket2_;
|
| // Copies data from socket1 to socket2.
|
| - const scoped_ptr<BufferedCopier> buffer1_;
|
| + const std::unique_ptr<BufferedCopier> buffer1_;
|
| // Copies data from socket2 to socket1.
|
| - const scoped_ptr<BufferedCopier> buffer2_;
|
| + const std::unique_ptr<BufferedCopier> buffer2_;
|
| };
|
|
|
| } // namespace forwarder2
|
|
|