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

Unified Diff: chrome/tools/mac_helpers/infoplist_strings_util.mm

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/tools/mac_helpers/infoplist_strings_util.mm
diff --git a/chrome/tools/mac_helpers/infoplist_strings_util.mm b/chrome/tools/mac_helpers/infoplist_strings_util.mm
index ede5a286aa4f64ece5693a33c0ac83973a2ced0c..932005f35bf59779c9c2d4c74eec187801005506 100644
--- a/chrome/tools/mac_helpers/infoplist_strings_util.mm
+++ b/chrome/tools/mac_helpers/infoplist_strings_util.mm
@@ -8,14 +8,14 @@
#import <Foundation/Foundation.h>
#include <stdint.h>
-
#include <stdio.h>
#include <unistd.h>
+#include <memory>
+
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/mac/scoped_nsautorelease_pool.h"
-#include "base/memory/scoped_ptr.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_piece.h"
#include "base/strings/string_util.h"
@@ -222,10 +222,8 @@ int main(int argc, char* const argv[]) {
const char* cur_lang = lang_list[loop];
// Open the branded string pak file
- scoped_ptr<ui::DataPack> branded_data_pack(
- LoadResourceDataPack(grit_output_dir,
- branding_strings_name,
- cur_lang));
+ std::unique_ptr<ui::DataPack> branded_data_pack(
+ LoadResourceDataPack(grit_output_dir, branding_strings_name, cur_lang));
if (branded_data_pack.get() == NULL) {
fprintf(stderr, "ERROR: Failed to load branded pak for language: %s\n",
cur_lang);

Powered by Google App Engine
This is Rietveld 408576698