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

Unified Diff: ui/views/view_unittest_aura.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/views/view_unittest.cc ('k') | ui/views/views_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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());
« no previous file with comments | « ui/views/view_unittest.cc ('k') | ui/views/views_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698