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

Unified Diff: courgette/program_detector.cc

Issue 1855133002: convert //courgette to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update comment in memory_allocator.h 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 | « courgette/program_detector.h ('k') | courgette/third_party/bsdiff_create.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: courgette/program_detector.cc
diff --git a/courgette/program_detector.cc b/courgette/program_detector.cc
index e0fe3e6508b7dcbc81a7960b73b4540c85cf3f42..80dbd2d852a497a46f884a44fcc098df8007bc12 100644
--- a/courgette/program_detector.cc
+++ b/courgette/program_detector.cc
@@ -19,8 +19,9 @@ namespace {
// Returns a new instance of Disassembler subclass if binary data given in
// |buffer| and |length| matches a known binary format, otherwise null.
-scoped_ptr<Disassembler> DetectDisassembler(const void* buffer, size_t length) {
- scoped_ptr<Disassembler> disassembler;
+std::unique_ptr<Disassembler> DetectDisassembler(const void* buffer,
+ size_t length) {
+ std::unique_ptr<Disassembler> disassembler;
disassembler.reset(new DisassemblerWin32X86(buffer, length));
if (disassembler->ParseHeader())
@@ -47,9 +48,10 @@ Status DetectExecutableType(const void* buffer,
size_t length,
ExecutableType* type,
size_t* detected_length) {
- scoped_ptr<Disassembler> disassembler(DetectDisassembler(buffer, length));
+ std::unique_ptr<Disassembler> disassembler(
+ DetectDisassembler(buffer, length));
- if (!disassembler) { // We failed to detect anything.
+ if (!disassembler) { // We failed to detect anything.
*type = EXE_UNKNOWN;
*detected_length = 0;
return C_INPUT_NOT_RECOGNIZED;
@@ -62,14 +64,15 @@ Status DetectExecutableType(const void* buffer,
Status ParseDetectedExecutable(const void* buffer,
size_t length,
- scoped_ptr<AssemblyProgram>* output) {
+ std::unique_ptr<AssemblyProgram>* output) {
output->reset();
- scoped_ptr<Disassembler> disassembler(DetectDisassembler(buffer, length));
+ std::unique_ptr<Disassembler> disassembler(
+ DetectDisassembler(buffer, length));
if (!disassembler)
return C_INPUT_NOT_RECOGNIZED;
- scoped_ptr<AssemblyProgram> program(
+ std::unique_ptr<AssemblyProgram> program(
new AssemblyProgram(disassembler->kind()));
if (!disassembler->Disassemble(program.get()))
« no previous file with comments | « courgette/program_detector.h ('k') | courgette/third_party/bsdiff_create.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698