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

Unified Diff: ash/wm/stacking_controller_unittest.cc

Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments 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 | « ash/wm/stacking_controller.h ('k') | ash/wm/system_background_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/stacking_controller_unittest.cc
diff --git a/ash/wm/stacking_controller_unittest.cc b/ash/wm/stacking_controller_unittest.cc
index 76658c23dd89bd4ec3326b830daf6f8a02779136..927ea7dc34acd00743ee41f80ec0153a47c74390 100644
--- a/ash/wm/stacking_controller_unittest.cc
+++ b/ash/wm/stacking_controller_unittest.cc
@@ -37,7 +37,7 @@ class StackingControllerTest : public test::AshTestBase {
// transient parent.
TEST_F(StackingControllerTest, TransientParent) {
// Normal window .
- scoped_ptr<Window> w2(CreateTestWindow());
+ std::unique_ptr<Window> w2(CreateTestWindow());
w2->SetBounds(gfx::Rect(10, 11, 250, 251));
aura::Window* launcher = Shell::GetContainer(Shell::GetPrimaryRootWindow(),
kShellWindowId_ShelfContainer);
@@ -47,7 +47,7 @@ TEST_F(StackingControllerTest, TransientParent) {
wm::ActivateWindow(w2.get());
// Window with a transient parent.
- scoped_ptr<Window> w1(CreateTestWindow());
+ std::unique_ptr<Window> w1(CreateTestWindow());
::wm::AddTransientChild(w2.get(), w1.get());
w1->SetBounds(gfx::Rect(10, 11, 250, 251));
ParentWindowInPrimaryRootWindow(w1.get());
« no previous file with comments | « ash/wm/stacking_controller.h ('k') | ash/wm/system_background_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698