From 160eb9249e8f5c4587c35b610b8fb81b6c69924d Mon Sep 17 00:00:00 2001 From: Jeremy Roman Date: Tue, 29 Aug 2017 17:43:43 +0000 Subject: [PATCH] Replace base::MakeUnique with std::make_unique in ipc/. base/memory/ptr_util.h includes will be cleaned up later. Bug: 755727 Change-Id: I0fb685d0ae0f6b7c6ad026eadafb5028e5dd130c Reviewed-on: https://chromium-review.googlesource.com/641635 Reviewed-by: Tom Sepez Commit-Queue: Jeremy Roman Cr-Commit-Position: refs/heads/master@{#498159} --- ipc/README.md | 2 +- ipc/ipc_channel_factory.cc | 2 +- ipc/ipc_channel_mojo.cc | 11 ++++++----- ipc/ipc_channel_nacl.cc | 4 ++-- ipc/ipc_message_unittest.cc | 8 ++++---- ipc/ipc_message_utils.cc | 14 +++++++------- ipc/ipc_message_utils_unittest.cc | 2 +- ipc/ipc_mojo_bootstrap.cc | 6 +++--- ipc/ipc_sync_channel.cc | 4 ++-- ipc/ipc_test_base.cc | 2 +- 10 files changed, 28 insertions(+), 27 deletions(-) diff --git a/ipc/README.md b/ipc/README.md index be5624dca39ad4..250a15927f2c49 100644 --- a/ipc/README.md +++ b/ipc/README.md @@ -303,7 +303,7 @@ to binder function: ``` cpp void BindFrobinator(mojom::FrobinatorRequest request) { - mojo::MakeStrongBinding(base::MakeUnique, std::move(request)); + mojo::MakeStrongBinding(std::make_unique, std::move(request)); } // |registry| will hereby handle all incoming requests for "mojom::Frobinator" diff --git a/ipc/ipc_channel_factory.cc b/ipc/ipc_channel_factory.cc index 775ac331ecc73c..08a52728d16828 100644 --- a/ipc/ipc_channel_factory.cc +++ b/ipc/ipc_channel_factory.cc @@ -49,7 +49,7 @@ std::unique_ptr ChannelFactory::Create( const ChannelHandle& handle, Channel::Mode mode, const scoped_refptr& ipc_task_runner) { - return base::MakeUnique(handle, mode, + return std::make_unique(handle, mode, ipc_task_runner); } diff --git a/ipc/ipc_channel_mojo.cc b/ipc/ipc_channel_mojo.cc index af5b86bc1d9a4f..38d07cc9e22c02 100644 --- a/ipc/ipc_channel_mojo.cc +++ b/ipc/ipc_channel_mojo.cc @@ -286,7 +286,7 @@ std::unique_ptr ChannelMojo::Create( std::unique_ptr ChannelMojo::CreateServerFactory( mojo::ScopedMessagePipeHandle handle, const scoped_refptr& ipc_task_runner) { - return base::MakeUnique( + return std::make_unique( std::move(handle), Channel::MODE_SERVER, ipc_task_runner); } @@ -294,7 +294,7 @@ std::unique_ptr ChannelMojo::CreateServerFactory( std::unique_ptr ChannelMojo::CreateClientFactory( mojo::ScopedMessagePipeHandle handle, const scoped_refptr& ipc_task_runner) { - return base::MakeUnique( + return std::make_unique( std::move(handle), Channel::MODE_CLIENT, ipc_task_runner); } @@ -424,9 +424,10 @@ ChannelMojo::GetAssociatedInterfaceSupport() { return this; } std::unique_ptr> ChannelMojo::CreateThreadSafeChannel() { - return base::MakeUnique>( - task_runner_, base::Bind(&ChannelMojo::ForwardMessageFromThreadSafePtr, - weak_factory_.GetWeakPtr()), + return std::make_unique>( + task_runner_, + base::Bind(&ChannelMojo::ForwardMessageFromThreadSafePtr, + weak_factory_.GetWeakPtr()), base::Bind(&ChannelMojo::ForwardMessageWithResponderFromThreadSafePtr, weak_factory_.GetWeakPtr()), *bootstrap_->GetAssociatedGroup()); diff --git a/ipc/ipc_channel_nacl.cc b/ipc/ipc_channel_nacl.cc index b95f8cb5453f74..638e01e887f250 100644 --- a/ipc/ipc_channel_nacl.cc +++ b/ipc/ipc_channel_nacl.cc @@ -220,7 +220,7 @@ void ChannelNacl::DidRecvMsg(std::unique_ptr contents) { if (pipe_ == -1) return; - auto data = base::MakeUnique>(); + auto data = std::make_unique>(); data->swap(contents->data); read_queue_.push_back(std::move(data)); @@ -386,7 +386,7 @@ std::unique_ptr Channel::Create( const IPC::ChannelHandle& channel_handle, Mode mode, Listener* listener) { - return base::MakeUnique(channel_handle, mode, listener); + return std::make_unique(channel_handle, mode, listener); } } // namespace IPC diff --git a/ipc/ipc_message_unittest.cc b/ipc/ipc_message_unittest.cc index a0f27ccc26a383..36b5d28da7ae42 100644 --- a/ipc/ipc_message_unittest.cc +++ b/ipc/ipc_message_unittest.cc @@ -69,7 +69,7 @@ TEST(IPCMessageTest, ListValue) { base::ListValue input; input.AppendDouble(42.42); input.AppendString("forty"); - input.Append(base::MakeUnique()); + input.Append(std::make_unique()); IPC::Message msg(1, 2, IPC::Message::PRIORITY_NORMAL); IPC::WriteParam(&msg, input); @@ -89,16 +89,16 @@ TEST(IPCMessageTest, ListValue) { TEST(IPCMessageTest, DictionaryValue) { base::DictionaryValue input; - input.Set("null", base::MakeUnique()); + input.Set("null", std::make_unique()); input.SetBoolean("bool", true); input.SetInteger("int", 42); input.SetKey("int.with.dot", base::Value(43)); - auto subdict = base::MakeUnique(); + auto subdict = std::make_unique(); subdict->SetString("str", "forty two"); subdict->SetBoolean("bool", false); - auto sublist = base::MakeUnique(); + auto sublist = std::make_unique(); sublist->AppendDouble(42.42); sublist->AppendString("forty"); sublist->AppendString("two"); diff --git a/ipc/ipc_message_utils.cc b/ipc/ipc_message_utils.cc index bfab6818d555cf..dd065fd07f7847 100644 --- a/ipc/ipc_message_utils.cc +++ b/ipc/ipc_message_utils.cc @@ -266,34 +266,34 @@ bool ReadValue(const base::Pickle* m, switch (static_cast(type)) { case base::Value::Type::NONE: - *value = base::MakeUnique(); + *value = std::make_unique(); break; case base::Value::Type::BOOLEAN: { bool val; if (!ReadParam(m, iter, &val)) return false; - *value = base::MakeUnique(val); + *value = std::make_unique(val); break; } case base::Value::Type::INTEGER: { int val; if (!ReadParam(m, iter, &val)) return false; - *value = base::MakeUnique(val); + *value = std::make_unique(val); break; } case base::Value::Type::DOUBLE: { double val; if (!ReadParam(m, iter, &val)) return false; - *value = base::MakeUnique(val); + *value = std::make_unique(val); break; } case base::Value::Type::STRING: { std::string val; if (!ReadParam(m, iter, &val)) return false; - *value = base::MakeUnique(std::move(val)); + *value = std::make_unique(std::move(val)); break; } case base::Value::Type::BINARY: { @@ -308,14 +308,14 @@ bool ReadValue(const base::Pickle* m, base::DictionaryValue val; if (!ReadDictionaryValue(m, iter, &val, recursion)) return false; - *value = base::MakeUnique(std::move(val)); + *value = std::make_unique(std::move(val)); break; } case base::Value::Type::LIST: { base::ListValue val; if (!ReadListValue(m, iter, &val, recursion)) return false; - *value = base::MakeUnique(std::move(val)); + *value = std::make_unique(std::move(val)); break; } default: diff --git a/ipc/ipc_message_utils_unittest.cc b/ipc/ipc_message_utils_unittest.cc index ddbe11261969f6..f4ca6ba933da26 100644 --- a/ipc/ipc_message_utils_unittest.cc +++ b/ipc/ipc_message_utils_unittest.cc @@ -102,7 +102,7 @@ TEST(IPCMessageUtilsTest, ValueSize) { value->SetKey("foo", base::Value(42)); value->SetKey("bar", base::Value(3.14)); value->SetKey("baz", base::Value("hello")); - value->SetWithoutPathExpansion("qux", base::MakeUnique()); + value->SetWithoutPathExpansion("qux", std::make_unique()); std::unique_ptr nested_dict(new base::DictionaryValue); nested_dict->SetKey("foobar", base::Value(5)); diff --git a/ipc/ipc_mojo_bootstrap.cc b/ipc/ipc_mojo_bootstrap.cc index 1307b9cd4ab7dc..506c9f88cb4272 100644 --- a/ipc/ipc_mojo_bootstrap.cc +++ b/ipc/ipc_mojo_bootstrap.cc @@ -502,7 +502,7 @@ class ChannelAssociatedGroupController { base::AutoLock locker(controller_->lock_); if (!sync_message_event_) { - sync_message_event_ = base::MakeUnique( + sync_message_event_ = std::make_unique( base::WaitableEvent::ResetPolicy::MANUAL, base::WaitableEvent::InitialState::NOT_SIGNALED); if (peer_closed_ || !sync_messages_.empty()) @@ -510,7 +510,7 @@ class ChannelAssociatedGroupController } } - sync_watcher_ = base::MakeUnique( + sync_watcher_ = std::make_unique( sync_message_event_.get(), base::Bind(&Endpoint::OnSyncMessageEventReady, base::Unretained(this))); @@ -928,7 +928,7 @@ std::unique_ptr MojoBootstrap::Create( mojo::ScopedMessagePipeHandle handle, Channel::Mode mode, const scoped_refptr& ipc_task_runner) { - return base::MakeUnique( + return std::make_unique( std::move(handle), new ChannelAssociatedGroupController( mode == Channel::MODE_SERVER, ipc_task_runner)); } diff --git a/ipc/ipc_sync_channel.cc b/ipc/ipc_sync_channel.cc index 7c1c44d88ae142..16a6878fc13262 100644 --- a/ipc/ipc_sync_channel.cc +++ b/ipc/ipc_sync_channel.cc @@ -280,7 +280,7 @@ class SyncChannel::ReceivedSyncMsgQueue : dispatch_event_(base::WaitableEvent::ResetPolicy::MANUAL, base::WaitableEvent::InitialState::NOT_SIGNALED), listener_task_runner_(base::ThreadTaskRunnerHandle::Get()), - sync_dispatch_watcher_(base::MakeUnique( + sync_dispatch_watcher_(std::make_unique( &dispatch_event_, base::Bind(&ReceivedSyncMsgQueue::OnDispatchEventReady, base::Unretained(this)))) { @@ -635,7 +635,7 @@ void SyncChannel::WaitForReply(mojo::SyncHandleRegistry* registry, base::WaitableEvent* pump_messages_event = nullptr; if (pump_messages) { if (!g_pump_messages_event.Get()) { - g_pump_messages_event.Get() = base::MakeUnique( + g_pump_messages_event.Get() = std::make_unique( base::WaitableEvent::ResetPolicy::MANUAL, base::WaitableEvent::InitialState::SIGNALED); } diff --git a/ipc/ipc_test_base.cc b/ipc/ipc_test_base.cc index d09b3b69ad96da..49cb11619bb8cb 100644 --- a/ipc/ipc_test_base.cc +++ b/ipc/ipc_test_base.cc @@ -18,7 +18,7 @@ IPCChannelMojoTestBase::~IPCChannelMojoTestBase() = default; void IPCChannelMojoTestBase::Init(const std::string& test_client_name) { InitWithCustomMessageLoop(test_client_name, - base::MakeUnique()); + std::make_unique()); } void IPCChannelMojoTestBase::InitWithCustomMessageLoop(