| Index: tools/android/forwarder2/forwarder.cc
|
| diff --git a/tools/android/forwarder2/forwarder.cc b/tools/android/forwarder2/forwarder.cc
|
| index 9945674aa6bc5d0f7ecd6fd1461ea457567ad0ae..3c49eef14772507e437eb42008854d8407375928 100644
|
| --- a/tools/android/forwarder2/forwarder.cc
|
| +++ b/tools/android/forwarder2/forwarder.cc
|
| @@ -223,7 +223,8 @@ class Forwarder::BufferedCopier {
|
| DISALLOW_COPY_AND_ASSIGN(BufferedCopier);
|
| };
|
|
|
| -Forwarder::Forwarder(scoped_ptr<Socket> socket1, scoped_ptr<Socket> socket2)
|
| +Forwarder::Forwarder(std::unique_ptr<Socket> socket1,
|
| + std::unique_ptr<Socket> socket2)
|
| : socket1_(std::move(socket1)),
|
| socket2_(std::move(socket2)),
|
| buffer1_(new BufferedCopier(socket1_.get(), socket2_.get())),
|
|
|