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

Unified Diff: ui/wm/core/window_util_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/wm/core/window_util.cc ('k') | ui/wm/core/wm_state.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/wm/core/window_util_unittest.cc
diff --git a/ui/wm/core/window_util_unittest.cc b/ui/wm/core/window_util_unittest.cc
index 35be225917956c27ea0f2630c012ecd467fd35e1..72516bec4217ea1daf4352a96b6fefcddb2d7dab 100644
--- a/ui/wm/core/window_util_unittest.cc
+++ b/ui/wm/core/window_util_unittest.cc
@@ -4,7 +4,8 @@
#include "ui/wm/core/window_util.h"
-#include "base/memory/scoped_ptr.h"
+#include <memory>
+
#include "ui/aura/test/aura_test_base.h"
#include "ui/aura/test/test_windows.h"
#include "ui/aura/window.h"
@@ -18,21 +19,20 @@ typedef aura::test::AuraTestBase WindowUtilTest;
// Test if the recreate layers does not recreate layers that have
// already been acquired.
TEST_F(WindowUtilTest, RecreateLayers) {
- scoped_ptr<aura::Window> window1(
+ std::unique_ptr<aura::Window> window1(
aura::test::CreateTestWindowWithId(0, NULL));
- scoped_ptr<aura::Window> window11(
+ std::unique_ptr<aura::Window> window11(
aura::test::CreateTestWindowWithId(1, window1.get()));
- scoped_ptr<aura::Window> window12(
+ std::unique_ptr<aura::Window> window12(
aura::test::CreateTestWindowWithId(2, window1.get()));
ASSERT_EQ(2u, window1->layer()->children().size());
- scoped_ptr<ui::Layer> acquired(window11->AcquireLayer());
+ std::unique_ptr<ui::Layer> acquired(window11->AcquireLayer());
EXPECT_TRUE(acquired.get());
EXPECT_EQ(acquired.get(), window11->layer());
- scoped_ptr<ui::LayerTreeOwner> tree =
- wm::RecreateLayers(window1.get());
+ std::unique_ptr<ui::LayerTreeOwner> tree = wm::RecreateLayers(window1.get());
// The detached layer should not have the layer that has
// already been detached.
« no previous file with comments | « ui/wm/core/window_util.cc ('k') | ui/wm/core/wm_state.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698