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

Unified Diff: cc/test/remote_proto_channel_bridge.cc

Issue 1866203004: Convert //cc from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptrcc: rebase 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 | « cc/test/remote_proto_channel_bridge.h ('k') | cc/test/render_pass_test_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/test/remote_proto_channel_bridge.cc
diff --git a/cc/test/remote_proto_channel_bridge.cc b/cc/test/remote_proto_channel_bridge.cc
index 496479f78ccc122651d81ad5c812e1072c52bbbd..3a93c223b77c6ba0b65c89006c3429e41195516a 100644
--- a/cc/test/remote_proto_channel_bridge.cc
+++ b/cc/test/remote_proto_channel_bridge.cc
@@ -4,8 +4,10 @@
#include "cc/test/remote_proto_channel_bridge.h"
+#include <memory>
+
#include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/ptr_util.h"
#include "cc/proto/compositor_message.pb.h"
namespace cc {
@@ -22,7 +24,7 @@ void FakeRemoteProtoChannel::SetProtoReceiver(ProtoReceiver* receiver) {
}
void FakeRemoteProtoChannel::OnProtoReceived(
- scoped_ptr<proto::CompositorMessage> proto) {
+ std::unique_ptr<proto::CompositorMessage> proto) {
DCHECK(receiver_);
receiver_->OnProtoReceived(std::move(proto));
@@ -55,7 +57,7 @@ void FakeRemoteProtoChannelMain::SendCompositorProto(
return;
default:
bridge_->channel_impl.OnProtoReceived(
- make_scoped_ptr(new proto::CompositorMessage(proto)));
+ base::WrapUnique(new proto::CompositorMessage(proto)));
}
}
@@ -66,7 +68,7 @@ FakeRemoteProtoChannelImpl::FakeRemoteProtoChannelImpl(
void FakeRemoteProtoChannelImpl::SendCompositorProto(
const proto::CompositorMessage& proto) {
bridge_->channel_main.OnProtoReceived(
- make_scoped_ptr(new proto::CompositorMessage(proto)));
+ base::WrapUnique(new proto::CompositorMessage(proto)));
}
RemoteProtoChannelBridge::RemoteProtoChannelBridge(TestHooks* test_hooks)
« no previous file with comments | « cc/test/remote_proto_channel_bridge.h ('k') | cc/test/render_pass_test_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698