ui/gfx/image/image_skia_unittest.cc - Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/gfx/image/image_skia_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

Index: ui/gfx/image/image_skia_unittest.cc

diff --git a/ui/gfx/image/image_skia_unittest.cc b/ui/gfx/image/image_skia_unittest.cc

index 3ff867dd75da70a914a3cd1ada11ca01d1702f04..091f6f916ea70643df225cacfe8b352ab006e8d9 100644

--- a/ui/gfx/image/image_skia_unittest.cc

+++ b/ui/gfx/image/image_skia_unittest.cc

@@ -390,7 +390,7 @@ TEST_F(ImageSkiaTest, StaticOnThreadTest) {

EXPECT_TRUE(image.CanModify());

image.DetachStorageFromThread();

- scoped_ptr<ImageSkia> deep_copy(image.DeepCopy());

+ std::unique_ptr<ImageSkia> deep_copy(image.DeepCopy());

EXPECT_FALSE(deep_copy->IsThreadSafe());

test::TestOnThread deepcopy_on_thread(deep_copy.get());

deepcopy_on_thread.StartAndJoin();

@@ -399,7 +399,7 @@ TEST_F(ImageSkiaTest, StaticOnThreadTest) {

EXPECT_FALSE(deep_copy->CanRead());

EXPECT_FALSE(deep_copy->CanModify());

- scoped_ptr<ImageSkia> deep_copy2(image.DeepCopy());

+ std::unique_ptr<ImageSkia> deep_copy2(image.DeepCopy());

EXPECT_EQ(1U, deep_copy2->image_reps().size());

// Access it from current thread so that it can't be

// accessed from another thread.

« no previous file with comments | « ui/gfx/image/image_skia.cc ('k') | ui/gfx/image/image_skia_util_mac.mm » ('j') | no next file with comments »