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

Unified Diff: chrome/browser/supervised_user/supervised_user_site_list.cc

Issue 1878143002: Convert //chrome/browser/supervised_user 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/browser/supervised_user/supervised_user_site_list.cc
diff --git a/chrome/browser/supervised_user/supervised_user_site_list.cc b/chrome/browser/supervised_user/supervised_user_site_list.cc
index 94264cc4c25385a0e2410274d5d1a24f1ac64942..2fc9400f571df979da8f9716e0a31d0f387ae2db 100644
--- a/chrome/browser/supervised_user/supervised_user_site_list.cc
+++ b/chrome/browser/supervised_user/supervised_user_site_list.cc
@@ -27,12 +27,13 @@ const char kWhitelistKey[] = "whitelist";
namespace {
-scoped_ptr<base::Value> ReadFileOnBlockingThread(const base::FilePath& path) {
+std::unique_ptr<base::Value> ReadFileOnBlockingThread(
+ const base::FilePath& path) {
SCOPED_UMA_HISTOGRAM_TIMER("ManagedUsers.Whitelist.ReadDuration");
JSONFileValueDeserializer deserializer(path);
int error_code;
std::string error_msg;
- scoped_ptr<base::Value> value =
+ std::unique_ptr<base::Value> value =
deserializer.Deserialize(&error_code, &error_msg);
if (!value) {
LOG(ERROR) << "Couldn't load site list " << path.value() << ": "
@@ -148,7 +149,7 @@ void SupervisedUserSiteList::OnJsonLoaded(
const base::FilePath& path,
base::TimeTicks start_time,
const SupervisedUserSiteList::LoadedCallback& callback,
- scoped_ptr<base::Value> value) {
+ std::unique_ptr<base::Value> value) {
if (!value)
return;

Powered by Google App Engine
This is Rietveld 408576698