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

Unified Diff: ui/base/models/tree_node_model_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/base/models/tree_node_model.h ('k') | ui/base/nine_image_painter_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/models/tree_node_model_unittest.cc
diff --git a/ui/base/models/tree_node_model_unittest.cc b/ui/base/models/tree_node_model_unittest.cc
index da5f8f998e7560037533ebc900fc0e1a53d7d82e..e24836f841c1716804ba1859b2235a69c3cd56a0 100644
--- a/ui/base/models/tree_node_model_unittest.cc
+++ b/ui/base/models/tree_node_model_unittest.cc
@@ -4,9 +4,10 @@
#include "ui/base/models/tree_node_model.h"
+#include <memory>
+
#include "base/compiler_specific.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/strings/string16.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
@@ -303,11 +304,11 @@ TEST_F(TreeNodeModelTest, BasicOperations) {
EXPECT_EQ(2, root.child_count());
EXPECT_EQ(child1->parent(), child2->parent());
- scoped_ptr<TestNode > c2(root.Remove(child2));
+ std::unique_ptr<TestNode> c2(root.Remove(child2));
EXPECT_EQ(1, root.child_count());
EXPECT_EQ(NULL, child2->parent());
- scoped_ptr<TestNode > c1(root.Remove(child1));
+ std::unique_ptr<TestNode> c1(root.Remove(child1));
EXPECT_EQ(0, root.child_count());
}
« no previous file with comments | « ui/base/models/tree_node_model.h ('k') | ui/base/nine_image_painter_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698