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

Unified Diff: chrome/installer/mini_installer/decompress.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
Index: chrome/installer/mini_installer/decompress.cc
diff --git a/chrome/installer/mini_installer/decompress.cc b/chrome/installer/mini_installer/decompress.cc
index f2acac99999c2d9dcbe30cceffbbcabdd142efd8..a43513d6df386bdd0400cd26f46d832c8770403a 100644
--- a/chrome/installer/mini_installer/decompress.cc
+++ b/chrome/installer/mini_installer/decompress.cc
@@ -85,7 +85,7 @@ FNOPEN(Open) {
disposition = OPEN_EXISTING;
}
- scoped_ptr<wchar_t> path(Utf8ToWide(pszFile));
+ std::unique_ptr<wchar_t> path(Utf8ToWide(pszFile));
Lei Zhang 2016/04/19 01:35:42 Weren't we going to leave this alone?
dcheng 2016/04/19 03:51:33 Done.
HANDLE file = CreateFileW(path, access, FILE_SHARE_READ, NULL, disposition,
FILE_ATTRIBUTE_NORMAL, NULL);
return reinterpret_cast<INT_PTR>(file);
@@ -236,11 +236,12 @@ bool Expand(const wchar_t* source, const wchar_t* destination) {
// Convert the name to utf8.
source_name++;
- scoped_ptr<char> source_name_utf8(WideToUtf8(source_name, -1));
+ std::unique_ptr<char> source_name_utf8(WideToUtf8(source_name, -1));
// The directory part is assumed to have a trailing backslash.
- scoped_ptr<char> source_path_utf8(WideToUtf8(source, source_name - source));
+ std::unique_ptr<char> source_path_utf8(
+ WideToUtf8(source, source_name - source));
- scoped_ptr<char> dest_utf8(WideToUtf8(destination, -1));
+ std::unique_ptr<char> dest_utf8(WideToUtf8(destination, -1));
if (!dest_utf8 || !source_name_utf8 || !source_path_utf8)
return false;

Powered by Google App Engine
This is Rietveld 408576698