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

Unified Diff: chrome/utility/safe_browsing/mac/dmg_iterator.h

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
« no previous file with comments | « chrome/utility/safe_browsing/mac/dmg_analyzer.cc ('k') | chrome/utility/safe_browsing/mac/dmg_iterator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
};
« no previous file with comments | « chrome/utility/safe_browsing/mac/dmg_analyzer.cc ('k') | chrome/utility/safe_browsing/mac/dmg_iterator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698