Index: chrome/utility/safe_browsing/mac/dmg_iterator.h |
diff --git a/chrome/utility/safe_browsing/mac/dmg_iterator.h b/chrome/utility/safe_browsing/mac/dmg_iterator.h |
index 0c6c4aaa1e79693b625fa0ead7dcf79f09613585..f4ebc0ce01c37eea89f1b6a70d467fb732dc7a0b 100644 |
--- a/chrome/utility/safe_browsing/mac/dmg_iterator.h |
+++ b/chrome/utility/safe_browsing/mac/dmg_iterator.h |
@@ -7,8 +7,9 @@ |
#include <stddef.h> |
+#include <memory> |
+ |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/memory/scoped_vector.h" |
#include "base/strings/string16.h" |
#include "chrome/utility/safe_browsing/mac/udif.h" |
@@ -44,13 +45,14 @@ class DMGIterator { |
base::string16 GetPath(); |
// Returns a ReadStream for the current file item. |
- scoped_ptr<ReadStream> GetReadStream(); |
+ std::unique_ptr<ReadStream> GetReadStream(); |
private: |
UDIFParser udif_; // The UDIF parser that accesses the partitions. |
ScopedVector<ReadStream> partitions_; // Streams for all the HFS partitions. |
size_t current_partition_; // The index in |partitions_| of the current one. |
- scoped_ptr<HFSIterator> hfs_; // The HFSIterator for |current_partition_|. |
+ std::unique_ptr<HFSIterator> |
+ hfs_; // The HFSIterator for |current_partition_|. |
DISALLOW_COPY_AND_ASSIGN(DMGIterator); |
}; |