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

Unified Diff: cc/trees/layer_tree_host_unittest_scroll.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
Index: cc/trees/layer_tree_host_unittest_scroll.cc
diff --git a/cc/trees/layer_tree_host_unittest_scroll.cc b/cc/trees/layer_tree_host_unittest_scroll.cc
index b5fce204890ec7ef1c12f21584e434d4e5ec267e..9280dd3247a96d40f5a804fad7aaf89cfb10f740 100644
--- a/cc/trees/layer_tree_host_unittest_scroll.cc
+++ b/cc/trees/layer_tree_host_unittest_scroll.cc
@@ -29,30 +29,30 @@
namespace cc {
namespace {
-scoped_ptr<ScrollState> BeginState(const gfx::Point& point) {
+std::unique_ptr<ScrollState> BeginState(const gfx::Point& point) {
ScrollStateData scroll_state_data;
scroll_state_data.is_beginning = true;
scroll_state_data.start_position_x = point.x();
scroll_state_data.start_position_y = point.y();
- scoped_ptr<ScrollState> scroll_state(new ScrollState(scroll_state_data));
+ std::unique_ptr<ScrollState> scroll_state(new ScrollState(scroll_state_data));
return scroll_state;
}
-scoped_ptr<ScrollState> UpdateState(const gfx::Point& point,
- const gfx::Vector2dF& delta) {
+std::unique_ptr<ScrollState> UpdateState(const gfx::Point& point,
+ const gfx::Vector2dF& delta) {
ScrollStateData scroll_state_data;
scroll_state_data.delta_x = delta.x();
scroll_state_data.delta_y = delta.y();
scroll_state_data.start_position_x = point.x();
scroll_state_data.start_position_y = point.y();
- scoped_ptr<ScrollState> scroll_state(new ScrollState(scroll_state_data));
+ std::unique_ptr<ScrollState> scroll_state(new ScrollState(scroll_state_data));
return scroll_state;
}
-scoped_ptr<ScrollState> EndState() {
+std::unique_ptr<ScrollState> EndState() {
ScrollStateData scroll_state_data;
scroll_state_data.is_ending = true;
- scoped_ptr<ScrollState> scroll_state(new ScrollState(scroll_state_data));
+ std::unique_ptr<ScrollState> scroll_state(new ScrollState(scroll_state_data));
return scroll_state;
}
@@ -1305,7 +1305,7 @@ TEST(LayerTreeHostFlingTest, DidStopFlingingThread) {
params.task_graph_runner = &task_graph_runner;
params.settings = &settings;
params.main_task_runner = base::ThreadTaskRunnerHandle::Get();
- scoped_ptr<LayerTreeHost> layer_tree_host =
+ std::unique_ptr<LayerTreeHost> layer_tree_host =
LayerTreeHost::CreateThreaded(impl_thread.task_runner(), &params);
impl_thread.task_runner()->PostTask(
« no previous file with comments | « cc/trees/layer_tree_host_unittest_remote_server.cc ('k') | cc/trees/layer_tree_host_unittest_serialization.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698