| 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());
|
| }
|
|
|
|
|