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

Unified Diff: ui/base/view_prop_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/user_activity/user_activity_detector_unittest.cc ('k') | ui/base/win/hwnd_subclass.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/view_prop_unittest.cc
diff --git a/ui/base/view_prop_unittest.cc b/ui/base/view_prop_unittest.cc
index d369c94fe92202d228c3b8875293ef9efb3f210b..15381affb9f0738f0d31c6a440f51cd5490a3ef9 100644
--- a/ui/base/view_prop_unittest.cc
+++ b/ui/base/view_prop_unittest.cc
@@ -2,11 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "testing/gtest/include/gtest/gtest.h"
-
-#include "base/memory/scoped_ptr.h"
#include "ui/base/view_prop.h"
+#include <memory>
+
+#include "testing/gtest/include/gtest/gtest.h"
+
namespace {
const char kKey1[] = "key_1";
const char kKey2[] = "key_2";
@@ -36,11 +37,11 @@ TEST(ViewPropTest, Basic) {
{
// Register a value for a view/key pair.
- scoped_ptr<ViewProp> v1(new ViewProp(nv1, kKey1, data1));
+ std::unique_ptr<ViewProp> v1(new ViewProp(nv1, kKey1, data1));
EXPECT_EQ(data1, ViewProp::GetValue(nv1, kKey1));
// Register a value for the same view/key pair.
- scoped_ptr<ViewProp> v2(new ViewProp(nv1, kKey1, data2));
+ std::unique_ptr<ViewProp> v2(new ViewProp(nv1, kKey1, data2));
// The new value should take over.
EXPECT_EQ(data2, ViewProp::GetValue(nv1, kKey1));
@@ -54,8 +55,8 @@ TEST(ViewPropTest, Basic) {
{
// Register a value for a view/key pair.
- scoped_ptr<ViewProp> v1(new ViewProp(nv1, kKey1, data1));
- scoped_ptr<ViewProp> v2(new ViewProp(nv2, kKey2, data2));
+ std::unique_ptr<ViewProp> v1(new ViewProp(nv1, kKey1, data1));
+ std::unique_ptr<ViewProp> v2(new ViewProp(nv2, kKey2, data2));
EXPECT_EQ(data1, ViewProp::GetValue(nv1, kKey1));
EXPECT_EQ(data2, ViewProp::GetValue(nv2, kKey2));
« no previous file with comments | « ui/base/user_activity/user_activity_detector_unittest.cc ('k') | ui/base/win/hwnd_subclass.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698