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

Unified Diff: extensions/browser/content_hash_tree.cc

Issue 1909773002: Convert //extensions/browser 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 | « extensions/browser/content_hash_reader.h ('k') | extensions/browser/content_hash_tree_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/browser/content_hash_tree.cc
diff --git a/extensions/browser/content_hash_tree.cc b/extensions/browser/content_hash_tree.cc
index 9831c12e7f84c604580acc8ba2c8f0be26ee49a9..8abbf6fd9f1ae8288275c3da6b5961017b943b58 100644
--- a/extensions/browser/content_hash_tree.cc
+++ b/extensions/browser/content_hash_tree.cc
@@ -4,7 +4,8 @@
#include "extensions/browser/content_hash_tree.h"
-#include "base/memory/scoped_ptr.h"
+#include <memory>
+
#include "base/stl_util.h"
#include "crypto/secure_hash.h"
#include "crypto/sha2.h"
@@ -32,7 +33,7 @@ std::string ComputeTreeHashRoot(const std::vector<std::string>& leaf_hashes,
// |branch_factor| elements to form the hash of each parent node.
std::vector<std::string>::const_iterator i = current->begin();
while (i != current->end()) {
- scoped_ptr<crypto::SecureHash> hash(
+ std::unique_ptr<crypto::SecureHash> hash(
crypto::SecureHash::Create(crypto::SecureHash::SHA256));
for (int j = 0; j < branch_factor && i != current->end(); j++) {
DCHECK_EQ(i->size(), crypto::kSHA256Length);
« no previous file with comments | « extensions/browser/content_hash_reader.h ('k') | extensions/browser/content_hash_tree_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698