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()); |