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

Unified Diff: cc/test/proxy_main_for_test.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/proxy_main_for_test.h ('k') | cc/test/remote_channel_impl_for_test.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/test/proxy_main_for_test.cc
diff --git a/cc/test/proxy_main_for_test.cc b/cc/test/proxy_main_for_test.cc
index 6a9fa4188bbbd66ac16d127477de4e61be6c9c7d..715e997ca8de9f4af70e753a6ecfb499bfe24866 100644
--- a/cc/test/proxy_main_for_test.cc
+++ b/cc/test/proxy_main_for_test.cc
@@ -10,25 +10,26 @@
namespace cc {
-scoped_ptr<ProxyMainForTest> ProxyMainForTest::CreateThreaded(
+std::unique_ptr<ProxyMainForTest> ProxyMainForTest::CreateThreaded(
TestHooks* test_hooks,
LayerTreeHost* host,
TaskRunnerProvider* task_runner_provider) {
- scoped_ptr<ProxyMainForTest> proxy_main(
+ std::unique_ptr<ProxyMainForTest> proxy_main(
new ProxyMainForTest(test_hooks, host, task_runner_provider));
- scoped_ptr<ThreadedChannelForTest> channel = ThreadedChannelForTest::Create(
- test_hooks, proxy_main.get(), task_runner_provider);
+ std::unique_ptr<ThreadedChannelForTest> channel =
+ ThreadedChannelForTest::Create(test_hooks, proxy_main.get(),
+ task_runner_provider);
proxy_main->threaded_channel_for_test_ = channel.get();
proxy_main->SetChannel(std::move(channel));
return proxy_main;
}
-scoped_ptr<ProxyMainForTest> ProxyMainForTest::CreateRemote(
+std::unique_ptr<ProxyMainForTest> ProxyMainForTest::CreateRemote(
TestHooks* test_hooks,
RemoteProtoChannel* remote_proto_channel,
LayerTreeHost* host,
TaskRunnerProvider* task_runner_provider) {
- scoped_ptr<ProxyMainForTest> proxy_main(
+ std::unique_ptr<ProxyMainForTest> proxy_main(
new ProxyMainForTest(test_hooks, host, task_runner_provider));
proxy_main->SetChannel(RemoteChannelMain::Create(
remote_proto_channel, proxy_main.get(), task_runner_provider));
@@ -70,7 +71,8 @@ void ProxyMainForTest::DidCommitAndDrawFrame() {
ProxyMain::DidCommitAndDrawFrame();
}
-void ProxyMainForTest::SetAnimationEvents(scoped_ptr<AnimationEvents> events) {
+void ProxyMainForTest::SetAnimationEvents(
+ std::unique_ptr<AnimationEvents> events) {
test_hooks_->ReceivedSetAnimationEvents();
ProxyMain::SetAnimationEvents(std::move(events));
}
@@ -98,15 +100,15 @@ void ProxyMainForTest::DidCompletePageScaleAnimation() {
}
void ProxyMainForTest::PostFrameTimingEventsOnMain(
- scoped_ptr<FrameTimingTracker::CompositeTimingSet> composite_events,
- scoped_ptr<FrameTimingTracker::MainFrameTimingSet> main_frame_events) {
+ std::unique_ptr<FrameTimingTracker::CompositeTimingSet> composite_events,
+ std::unique_ptr<FrameTimingTracker::MainFrameTimingSet> main_frame_events) {
test_hooks_->ReceivedPostFrameTimingEventsOnMain();
ProxyMain::PostFrameTimingEventsOnMain(std::move(composite_events),
std::move(main_frame_events));
}
void ProxyMainForTest::BeginMainFrame(
- scoped_ptr<BeginMainFrameAndCommitState> begin_main_frame_state) {
+ std::unique_ptr<BeginMainFrameAndCommitState> begin_main_frame_state) {
test_hooks_->ReceivedBeginMainFrame();
ProxyMain::BeginMainFrame(std::move(begin_main_frame_state));
}
« no previous file with comments | « cc/test/proxy_main_for_test.h ('k') | cc/test/remote_channel_impl_for_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698