Convert scoped_ptr to std::unique_ptr in //ipc.
TBR=brettw, jam, [email protected]
BUG=554298
Review URL: https://codereview.chromium.org/1913363002
Cr-Commit-Position: refs/heads/master@{#389361}
diff --git a/ipc/ipc_send_fds_test.cc b/ipc/ipc_send_fds_test.cc
index 2d5616b..81a995da 100644
--- a/ipc/ipc_send_fds_test.cc
+++ b/ipc/ipc_send_fds_test.cc
@@ -16,6 +16,7 @@
#include <sys/stat.h>
#include <unistd.h>
+#include <memory>
#include <queue>
#include "base/callback.h"
@@ -158,7 +159,7 @@
MyChannelDescriptorListener listener(expected_inode_num);
// Set up IPC channel.
- scoped_ptr<IPC::Channel> channel(IPC::Channel::CreateClient(
+ std::unique_ptr<IPC::Channel> channel(IPC::Channel::CreateClient(
IPCTestBase::GetChannelName(test_client_name), &listener));
CHECK(channel->Connect());
@@ -266,8 +267,8 @@
FROM_HERE, base::Bind(&PipeChannelHelper::Connect, out.get()));
}
- static void DestroyChannel(scoped_ptr<IPC::Channel> *c,
- base::WaitableEvent *event) {
+ static void DestroyChannel(std::unique_ptr<IPC::Channel>* c,
+ base::WaitableEvent* event) {
c->reset(0);
event->Signal();
}
@@ -300,7 +301,7 @@
}
private:
- scoped_ptr<IPC::Channel> in, out;
+ std::unique_ptr<IPC::Channel> in, out;
base::Thread* in_thread_;
base::Thread* out_thread_;
MyCBListener cb_listener_;
@@ -359,9 +360,9 @@
// Unless the workaround is in place. With 10000 sends, we
// should see at least a 3% failure rate.
const int pipes_to_send = 20000;
- scoped_ptr<base::Thread> producer(CreateThread("producer"));
- scoped_ptr<base::Thread> middleman(CreateThread("middleman"));
- scoped_ptr<base::Thread> consumer(CreateThread("consumer"));
+ std::unique_ptr<base::Thread> producer(CreateThread("producer"));
+ std::unique_ptr<base::Thread> middleman(CreateThread("middleman"));
+ std::unique_ptr<base::Thread> consumer(CreateThread("consumer"));
PipeChannelHelper pipe1(
middleman.get(),
consumer.get(),
