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

Unified Diff: ui/touch_selection/touch_selection_controller_unittest.cc

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr 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: ui/touch_selection/touch_selection_controller_unittest.cc
diff --git a/ui/touch_selection/touch_selection_controller_unittest.cc b/ui/touch_selection/touch_selection_controller_unittest.cc
index 8b363cb0451a1f53d224d4c684e937c216c9a7b2..a5fe6ad50a31062502d300dda3480d203cf4d476 100644
--- a/ui/touch_selection/touch_selection_controller_unittest.cc
+++ b/ui/touch_selection/touch_selection_controller_unittest.cc
@@ -7,6 +7,7 @@
#include <vector>
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/events/test/motion_event_test_utils.h"
@@ -101,8 +102,8 @@ class TouchSelectionControllerTest : public testing::Test,
last_event_bounds_rect_ = controller_->GetRectBetweenBounds();
}
- scoped_ptr<TouchHandleDrawable> CreateDrawable() override {
- return make_scoped_ptr(new MockTouchHandleDrawable(&dragging_enabled_));
+ std::unique_ptr<TouchHandleDrawable> CreateDrawable() override {
+ return base::WrapUnique(new MockTouchHandleDrawable(&dragging_enabled_));
}
void AllowShowingOnTapForEmptyEditable() {
@@ -238,7 +239,7 @@ class TouchSelectionControllerTest : public testing::Test,
bool needs_animate_;
bool animation_enabled_;
bool dragging_enabled_;
- scoped_ptr<TouchSelectionController> controller_;
+ std::unique_ptr<TouchSelectionController> controller_;
DISALLOW_COPY_AND_ASSIGN(TouchSelectionControllerTest);
};
« no previous file with comments | « ui/touch_selection/touch_selection_controller.cc ('k') | ui/views/accessibility/ax_aura_obj_cache_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698