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

Unified Diff: ui/views/corewm/desktop_capture_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
« no previous file with comments | « ui/views/corewm/cursor_height_provider_win.cc ('k') | ui/views/corewm/tooltip_aura.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/corewm/desktop_capture_controller_unittest.cc
diff --git a/ui/views/corewm/desktop_capture_controller_unittest.cc b/ui/views/corewm/desktop_capture_controller_unittest.cc
index 879cafc86d0af3b0d31d1f1e1d3dad05889e50a4..d3aff0dbea7ffa4d8a3c0b564f63832fc172c451 100644
--- a/ui/views/corewm/desktop_capture_controller_unittest.cc
+++ b/ui/views/corewm/desktop_capture_controller_unittest.cc
@@ -86,8 +86,8 @@ views::Widget* CreateWidget() {
// creates two widgets, does a mouse press in one, sets capture in the other and
// verifies state is reset in the first.
TEST_F(DesktopCaptureControllerTest, ResetMouseHandlers) {
- scoped_ptr<Widget> w1(CreateWidget());
- scoped_ptr<Widget> w2(CreateWidget());
+ std::unique_ptr<Widget> w1(CreateWidget());
+ std::unique_ptr<Widget> w2(CreateWidget());
ui::test::EventGenerator generator1(w1->GetNativeView()->GetRootWindow());
generator1.MoveMouseToCenterOf(w1->GetNativeView());
generator1.PressLeftButton();
@@ -111,12 +111,12 @@ TEST_F(DesktopCaptureControllerTest, ResetMouseHandlers) {
// the window which had capture receives the gesture.
// TODO(sky): move this test, it should be part of ScopedCaptureClient tests.
TEST_F(DesktopCaptureControllerTest, CaptureWindowInputEventTest) {
- scoped_ptr<aura::client::ScreenPositionClient> desktop_position_client1;
- scoped_ptr<aura::client::ScreenPositionClient> desktop_position_client2;
+ std::unique_ptr<aura::client::ScreenPositionClient> desktop_position_client1;
+ std::unique_ptr<aura::client::ScreenPositionClient> desktop_position_client2;
- scoped_ptr<Widget> widget1(new Widget());
+ std::unique_ptr<Widget> widget1(new Widget());
Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
- scoped_ptr<wm::ScopedCaptureClient> scoped_capture_client(
+ std::unique_ptr<wm::ScopedCaptureClient> scoped_capture_client(
new wm::ScopedCaptureClient(params.context->GetRootWindow()));
aura::client::CaptureClient* capture_client =
scoped_capture_client->capture_client();
@@ -137,7 +137,7 @@ TEST_F(DesktopCaptureControllerTest, CaptureWindowInputEventTest) {
root1->AddChildView(v1);
widget1->Show();
- scoped_ptr<Widget> widget2(new Widget());
+ std::unique_ptr<Widget> widget2(new Widget());
params = CreateParams(Widget::InitParams::TYPE_POPUP);
params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
« no previous file with comments | « ui/views/corewm/cursor_height_provider_win.cc ('k') | ui/views/corewm/tooltip_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698