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

Unified Diff: mash/wm/layout_manager_unittest.cc

Issue 1857623003: convert //mash to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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 | « mash/wm/frame/non_client_frame_view_mash.cc ('k') | mash/wm/non_client_frame_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/wm/layout_manager_unittest.cc
diff --git a/mash/wm/layout_manager_unittest.cc b/mash/wm/layout_manager_unittest.cc
index 1b6b2d08265973a874eafcade290efed62df99a2..1ddbfe3c37ea70e7a12896e6deb1b202b8ab0cf1 100644
--- a/mash/wm/layout_manager_unittest.cc
+++ b/mash/wm/layout_manager_unittest.cc
@@ -4,6 +4,8 @@
#include "mash/wm/layout_manager.h"
+#include <memory>
+
#include "base/macros.h"
#include "components/mus/public/cpp/tests/test_window.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -36,7 +38,7 @@ class TestLayoutManager : public LayoutManager {
// Tests that owning window can be destroyed before the layout manager.
TEST(LayoutManagerTest, OwningWindowDestroyedFirst) {
- scoped_ptr<mus::TestWindow> parent(new mus::TestWindow(1));
+ std::unique_ptr<mus::TestWindow> parent(new mus::TestWindow(1));
mus::TestWindow child(2);
TestLayoutManager layout_manager(parent.get());
parent->AddChild(&child);
@@ -49,7 +51,8 @@ TEST(LayoutManagerTest, OwningWindowDestroyedFirst) {
TEST(LayoutManagerTest, LayoutManagerDestroyedFirst) {
mus::TestWindow parent(1);
mus::TestWindow child(2);
- scoped_ptr<TestLayoutManager> layout_manager(new TestLayoutManager(&parent));
+ std::unique_ptr<TestLayoutManager> layout_manager(
+ new TestLayoutManager(&parent));
parent.AddChild(&child);
EXPECT_TRUE(layout_manager->GetAndResetLayoutCalled());
« no previous file with comments | « mash/wm/frame/non_client_frame_view_mash.cc ('k') | mash/wm/non_client_frame_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698