Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(416)

Unified Diff: content/test/dwrite_font_fake_sender_win.cc

Issue 1874903002: Convert //content from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix indent Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/test/dwrite_font_fake_sender_win.h ('k') | content/test/fake_compositor_dependencies.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/test/dwrite_font_fake_sender_win.cc
diff --git a/content/test/dwrite_font_fake_sender_win.cc b/content/test/dwrite_font_fake_sender_win.cc
index 83203af354f77704ba72b02ef407bdb4adc13aee..62f5fed40817a6c37bf83753b8c6454fe3f5f892 100644
--- a/content/test/dwrite_font_fake_sender_win.cc
+++ b/content/test/dwrite_font_fake_sender_win.cc
@@ -68,8 +68,8 @@ FakeFontCollection::ReplySender::ReplySender(FakeFontCollection* collection)
FakeFontCollection::ReplySender::~ReplySender() = default;
-scoped_ptr<IPC::Message>& FakeFontCollection::ReplySender::OnMessageReceived(
- const IPC::Message& msg) {
+std::unique_ptr<IPC::Message>&
+FakeFontCollection::ReplySender::OnMessageReceived(const IPC::Message& msg) {
reply_.reset();
bool handled = true;
IPC_BEGIN_MESSAGE_MAP(ReplySender, msg)
@@ -122,11 +122,11 @@ bool FakeFontCollection::FakeSender::Send(IPC::Message* message) {
else
incoming_message.reset(message); // Ensure message is deleted.
std::unique_ptr<ReplySender> sender = collection_->GetReplySender();
- scoped_ptr<IPC::Message> reply;
+ std::unique_ptr<IPC::Message> reply;
reply.swap(sender->OnMessageReceived(*message));
IPC::SyncMessage* sync_message = reinterpret_cast<IPC::SyncMessage*>(message);
- scoped_ptr<IPC::MessageReplyDeserializer> serializer(
+ std::unique_ptr<IPC::MessageReplyDeserializer> serializer(
sync_message->GetReplyDeserializer());
serializer->SerializeOutputParameters(*(reply.get()));
return true;
« no previous file with comments | « content/test/dwrite_font_fake_sender_win.h ('k') | content/test/fake_compositor_dependencies.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698