chrome/utility/safe_browsing/mac/hfs_unittest.cc - Issue 1899083002: Convert //chrome from scoped_ptr to std::unique_ptr

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: chrome/utility/safe_browsing/mac/hfs_unittest.cc

Issue 1899083002: Convert //chrome from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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

« chrome/utility/importer/edge_database_reader_win.h ('K') | « chrome/utility/safe_browsing/mac/hfs.cc ('k') | chrome/utility/safe_browsing/mac/read_stream_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/utility/safe_browsing/mac/hfs_unittest.cc

diff --git a/chrome/utility/safe_browsing/mac/hfs_unittest.cc b/chrome/utility/safe_browsing/mac/hfs_unittest.cc

index df94e6ab91359612476f26a2ebf6325d7c643856..9b9416946a82757efb558afcd9096300d4894a11 100644

--- a/chrome/utility/safe_browsing/mac/hfs_unittest.cc

+++ b/chrome/utility/safe_browsing/mac/hfs_unittest.cc

@@ -131,14 +131,14 @@ class HFSFileReadTest : public testing::TestWithParam<const char*> {

private:

base::File hfs_file_;

- scoped_ptr<FileReadStream> hfs_stream_;

- scoped_ptr<HFSIterator> hfs_reader_;

+ std::unique_ptr<FileReadStream> hfs_stream_;

+ std::unique_ptr<HFSIterator> hfs_reader_;

};

TEST_P(HFSFileReadTest, ReadReadme) {

ASSERT_TRUE(GoToFile("README.txt"));

- scoped_ptr<ReadStream> stream = hfs_reader()->GetReadStream();

+ std::unique_ptr<ReadStream> stream = hfs_reader()->GetReadStream();

ASSERT_TRUE(stream.get());

EXPECT_FALSE(hfs_reader()->IsSymbolicLink());

@@ -168,7 +168,7 @@ TEST_P(HFSFileReadTest, ReadReadme) {

TEST_P(HFSFileReadTest, ReadRandom) {

ASSERT_TRUE(GoToFile("fifth/random"));

- scoped_ptr<ReadStream> stream = hfs_reader()->GetReadStream();

+ std::unique_ptr<ReadStream> stream = hfs_reader()->GetReadStream();

ASSERT_TRUE(stream.get());

EXPECT_FALSE(hfs_reader()->IsSymbolicLink());

@@ -183,7 +183,7 @@ TEST_P(HFSFileReadTest, ReadRandom) {

TEST_P(HFSFileReadTest, Symlink) {

ASSERT_TRUE(GoToFile("symlink-random"));

- scoped_ptr<ReadStream> stream = hfs_reader()->GetReadStream();

+ std::unique_ptr<ReadStream> stream = hfs_reader()->GetReadStream();

ASSERT_TRUE(stream.get());

EXPECT_TRUE(hfs_reader()->IsSymbolicLink());

@@ -209,7 +209,7 @@ TEST_P(HFSFileReadTest, HardLink) {

TEST_P(HFSFileReadTest, DecmpfsFile) {

ASSERT_TRUE(GoToFile("first/second/goat-output.txt"));

- scoped_ptr<ReadStream> stream = hfs_reader()->GetReadStream();

+ std::unique_ptr<ReadStream> stream = hfs_reader()->GetReadStream();

ASSERT_TRUE(stream.get());

EXPECT_FALSE(hfs_reader()->IsSymbolicLink());