Index: ui/views/touchui/touch_selection_controller_impl_unittest.cc |
diff --git a/ui/views/touchui/touch_selection_controller_impl_unittest.cc b/ui/views/touchui/touch_selection_controller_impl_unittest.cc |
index 3bdbbd5f6c54fa211a1ad2f2710ed46594651b05..213170162b2aa9dcff012bc3903dedda6939dc74 100644 |
--- a/ui/views/touchui/touch_selection_controller_impl_unittest.cc |
+++ b/ui/views/touchui/touch_selection_controller_impl_unittest.cc |
@@ -273,9 +273,9 @@ class TouchSelectionControllerImplTest : public ViewsTestBase { |
Widget* widget_; |
Textfield* textfield_; |
- scoped_ptr<TextfieldTestApi> textfield_test_api_; |
- scoped_ptr<ViewsTouchEditingControllerFactory> views_tsc_factory_; |
- scoped_ptr<aura::test::TestCursorClient> test_cursor_client_; |
+ std::unique_ptr<TextfieldTestApi> textfield_test_api_; |
+ std::unique_ptr<ViewsTouchEditingControllerFactory> views_tsc_factory_; |
+ std::unique_ptr<aura::test::TestCursorClient> test_cursor_client_; |
private: |
DISALLOW_COPY_AND_ASSIGN(TouchSelectionControllerImplTest); |
@@ -685,8 +685,9 @@ TEST_F(TouchSelectionControllerImplTest, |
CreateWidget(); |
TestTouchEditable touch_editable(widget_->GetNativeView()); |
- scoped_ptr<ui::TouchEditingControllerDeprecated> touch_selection_controller( |
- ui::TouchEditingControllerDeprecated::Create(&touch_editable)); |
+ std::unique_ptr<ui::TouchEditingControllerDeprecated> |
+ touch_selection_controller( |
+ ui::TouchEditingControllerDeprecated::Create(&touch_editable)); |
touch_editable.set_bounds(gfx::Rect(0, 0, 100, 20)); |