| Index: ui/views/view_unittest_aura.cc
|
| diff --git a/ui/views/view_unittest_aura.cc b/ui/views/view_unittest_aura.cc
|
| index 568a29cf264c2a6946a325393ce094db582e4c88..531302ae75b9e2792239206f7a84b27acade1196 100644
|
| --- a/ui/views/view_unittest_aura.cc
|
| +++ b/ui/views/view_unittest_aura.cc
|
| @@ -4,7 +4,8 @@
|
|
|
| #include "ui/views/view.h"
|
|
|
| -#include "base/memory/scoped_ptr.h"
|
| +#include <memory>
|
| +
|
| #include "ui/aura/window.h"
|
| #include "ui/compositor/layer.h"
|
| #include "ui/compositor/layer_tree_owner.h"
|
| @@ -120,7 +121,7 @@ TEST_F(ViewAuraTest, RecreateLayersWithWindows) {
|
| EXPECT_EQ(v7_layer, old_w1_root_sublayers[2]);
|
|
|
| {
|
| - scoped_ptr<ui::LayerTreeOwner> cloned_owner(
|
| + std::unique_ptr<ui::LayerTreeOwner> cloned_owner(
|
| wm::RecreateLayers(w1->GetNativeView()));
|
| EXPECT_EQ(w1_layer, cloned_owner->root());
|
| EXPECT_NE(w1_layer, w1->GetNativeView()->layer());
|
|
|