chrome/utility/importer/nss_decryptor.cc - Issue 1899083002: Convert //chrome from scoped_ptr to std::unique_ptr

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/utility/importer/nss_decryptor.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/importer/firefox_importer_unittest_utils_mac.cc ('k') | chrome/utility/media_galleries/media_metadata_parser.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/utility/importer/nss_decryptor.cc

diff --git a/chrome/utility/importer/nss_decryptor.cc b/chrome/utility/importer/nss_decryptor.cc

index 5e5172fcb709791a05709213c347ff7d339993bd..3f3d83834f5a08e2c3b5481c5e9064265340e4e5 100644

--- a/chrome/utility/importer/nss_decryptor.cc

+++ b/chrome/utility/importer/nss_decryptor.cc

@@ -6,13 +6,13 @@

#include <stddef.h>

+#include <memory>

#include <string>

#include <vector>

#include "base/base64.h"

#include "base/files/file_util.h"

#include "base/json/json_reader.h"

-#include "base/memory/scoped_ptr.h"

#include "base/strings/string_split.h"

#include "base/strings/string_util.h"

#include "base/strings/utf_string_conversions.h"

@@ -295,7 +295,8 @@ bool NSSDecryptor::ReadAndParseLogins(

std::vector<autofill::PasswordForm>* forms) {

std::string json_content;

base::ReadFileToString(json_file, &json_content);

- scoped_ptr<base::Value> parsed_json(base::JSONReader::Read(json_content));

+ std::unique_ptr<base::Value> parsed_json(

+ base::JSONReader::Read(json_content));

const base::DictionaryValue* password_dict;

const base::ListValue* password_list;

const base::ListValue* blacklist_domains;