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

Unified Diff: chrome/utility/image_writer/image_writer.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
« no previous file with comments | « chrome/utility/image_writer/image_writer.h ('k') | chrome/utility/image_writer/image_writer_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/utility/image_writer/image_writer.cc
diff --git a/chrome/utility/image_writer/image_writer.cc b/chrome/utility/image_writer/image_writer.cc
index 4b3569e8d5839f4847ede8020444f0ed53772117..9249613fcb35de1c279e203d21e29621b4fb46f9 100644
--- a/chrome/utility/image_writer/image_writer.cc
+++ b/chrome/utility/image_writer/image_writer.cc
@@ -119,7 +119,7 @@ void ImageWriter::WriteChunk() {
}
// DASD buffers require memory alignment on some systems.
- scoped_ptr<char, base::AlignedFreeDeleter> buffer(static_cast<char*>(
+ std::unique_ptr<char, base::AlignedFreeDeleter> buffer(static_cast<char*>(
base::AlignedAlloc(kBurningBlockSize, kMemoryAlignment)));
memset(buffer.get(), 0, kBurningBlockSize);
@@ -160,10 +160,11 @@ void ImageWriter::VerifyChunk() {
return;
}
- scoped_ptr<char[]> image_buffer(new char[kBurningBlockSize]);
+ std::unique_ptr<char[]> image_buffer(new char[kBurningBlockSize]);
// DASD buffers require memory alignment on some systems.
- scoped_ptr<char, base::AlignedFreeDeleter> device_buffer(static_cast<char*>(
- base::AlignedAlloc(kBurningBlockSize, kMemoryAlignment)));
+ std::unique_ptr<char, base::AlignedFreeDeleter> device_buffer(
+ static_cast<char*>(
+ base::AlignedAlloc(kBurningBlockSize, kMemoryAlignment)));
int bytes_read = image_file_.Read(bytes_processed_, image_buffer.get(),
kBurningBlockSize);
« no previous file with comments | « chrome/utility/image_writer/image_writer.h ('k') | chrome/utility/image_writer/image_writer_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698