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

Side by Side 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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/test/remote_proto_channel_bridge.h" 5 #include "cc/test/remote_proto_channel_bridge.h"
6 6
7 #include <memory>
8
7 #include "base/logging.h" 9 #include "base/logging.h"
8 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/ptr_util.h"
9 #include "cc/proto/compositor_message.pb.h" 11 #include "cc/proto/compositor_message.pb.h"
10 12
11 namespace cc { 13 namespace cc {
12 14
13 FakeRemoteProtoChannel::FakeRemoteProtoChannel(RemoteProtoChannelBridge* bridge) 15 FakeRemoteProtoChannel::FakeRemoteProtoChannel(RemoteProtoChannelBridge* bridge)
14 : bridge_(bridge), receiver_(nullptr) { 16 : bridge_(bridge), receiver_(nullptr) {
15 DCHECK(bridge_); 17 DCHECK(bridge_);
16 } 18 }
17 19
18 FakeRemoteProtoChannel::~FakeRemoteProtoChannel() {} 20 FakeRemoteProtoChannel::~FakeRemoteProtoChannel() {}
19 21
20 void FakeRemoteProtoChannel::SetProtoReceiver(ProtoReceiver* receiver) { 22 void FakeRemoteProtoChannel::SetProtoReceiver(ProtoReceiver* receiver) {
21 receiver_ = receiver; 23 receiver_ = receiver;
22 } 24 }
23 25
24 void FakeRemoteProtoChannel::OnProtoReceived( 26 void FakeRemoteProtoChannel::OnProtoReceived(
25 scoped_ptr<proto::CompositorMessage> proto) { 27 std::unique_ptr<proto::CompositorMessage> proto) {
26 DCHECK(receiver_); 28 DCHECK(receiver_);
27 29
28 receiver_->OnProtoReceived(std::move(proto)); 30 receiver_->OnProtoReceived(std::move(proto));
29 } 31 }
30 32
31 bool FakeRemoteProtoChannel::HasReceiver() const { 33 bool FakeRemoteProtoChannel::HasReceiver() const {
32 return receiver_ != nullptr; 34 return receiver_ != nullptr;
33 } 35 }
34 36
35 FakeRemoteProtoChannelMain::FakeRemoteProtoChannelMain( 37 FakeRemoteProtoChannelMain::FakeRemoteProtoChannelMain(
(...skipping 12 matching lines...) Expand all
48 case proto::CompositorMessageToImpl::UNKNOWN: 50 case proto::CompositorMessageToImpl::UNKNOWN:
49 return; 51 return;
50 case proto::CompositorMessageToImpl::INITIALIZE_IMPL: 52 case proto::CompositorMessageToImpl::INITIALIZE_IMPL:
51 test_hooks_->CreateRemoteClientHost(to_impl_proto); 53 test_hooks_->CreateRemoteClientHost(to_impl_proto);
52 return; 54 return;
53 case proto::CompositorMessageToImpl::CLOSE_IMPL: 55 case proto::CompositorMessageToImpl::CLOSE_IMPL:
54 test_hooks_->DestroyRemoteClientHost(); 56 test_hooks_->DestroyRemoteClientHost();
55 return; 57 return;
56 default: 58 default:
57 bridge_->channel_impl.OnProtoReceived( 59 bridge_->channel_impl.OnProtoReceived(
58 make_scoped_ptr(new proto::CompositorMessage(proto))); 60 base::WrapUnique(new proto::CompositorMessage(proto)));
59 } 61 }
60 } 62 }
61 63
62 FakeRemoteProtoChannelImpl::FakeRemoteProtoChannelImpl( 64 FakeRemoteProtoChannelImpl::FakeRemoteProtoChannelImpl(
63 RemoteProtoChannelBridge* bridge) 65 RemoteProtoChannelBridge* bridge)
64 : FakeRemoteProtoChannel(bridge) {} 66 : FakeRemoteProtoChannel(bridge) {}
65 67
66 void FakeRemoteProtoChannelImpl::SendCompositorProto( 68 void FakeRemoteProtoChannelImpl::SendCompositorProto(
67 const proto::CompositorMessage& proto) { 69 const proto::CompositorMessage& proto) {
68 bridge_->channel_main.OnProtoReceived( 70 bridge_->channel_main.OnProtoReceived(
69 make_scoped_ptr(new proto::CompositorMessage(proto))); 71 base::WrapUnique(new proto::CompositorMessage(proto)));
70 } 72 }
71 73
72 RemoteProtoChannelBridge::RemoteProtoChannelBridge(TestHooks* test_hooks) 74 RemoteProtoChannelBridge::RemoteProtoChannelBridge(TestHooks* test_hooks)
73 : channel_main(this, test_hooks), channel_impl(this) {} 75 : channel_main(this, test_hooks), channel_impl(this) {}
74 76
75 RemoteProtoChannelBridge::~RemoteProtoChannelBridge() {} 77 RemoteProtoChannelBridge::~RemoteProtoChannelBridge() {}
76 78
77 } // namespace cc 79 } // namespace cc
OLDNEW
« 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