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

Unified Diff: chrome/browser/chromeos/policy/user_cloud_external_data_manager.cc

Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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/chromeos/policy/user_cloud_external_data_manager.cc
diff --git a/chrome/browser/chromeos/policy/user_cloud_external_data_manager.cc b/chrome/browser/chromeos/policy/user_cloud_external_data_manager.cc
index 52a7eed6e137636c7c92569e552828649a6408f8..fc9512e2f13fe11b8669c16bd4ac9e7c4ab70450 100644
--- a/chrome/browser/chromeos/policy/user_cloud_external_data_manager.cc
+++ b/chrome/browser/chromeos/policy/user_cloud_external_data_manager.cc
@@ -4,8 +4,10 @@
#include "chrome/browser/chromeos/policy/user_cloud_external_data_manager.h"
+#include <memory>
+
#include "base/location.h"
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/ptr_util.h"
#include "base/sequenced_task_runner.h"
#include "chrome/browser/chromeos/policy/cloud_external_data_store.h"
#include "components/policy/core/common/cloud/cloud_policy_store.h"
@@ -30,12 +32,12 @@ UserCloudExternalDataManager::UserCloudExternalDataManager(
io_task_runner),
resource_cache_(new ResourceCache(cache_path, backend_task_runner)) {
SetPolicyStore(policy_store);
- SetExternalDataStore(make_scoped_ptr(new CloudExternalDataStore(
+ SetExternalDataStore(base::WrapUnique(new CloudExternalDataStore(
kCacheKey, backend_task_runner, resource_cache_)));
}
UserCloudExternalDataManager::~UserCloudExternalDataManager() {
- SetExternalDataStore(scoped_ptr<CloudExternalDataStore>());
+ SetExternalDataStore(std::unique_ptr<CloudExternalDataStore>());
backend_task_runner_->DeleteSoon(FROM_HERE, resource_cache_);
}

Powered by Google App Engine
This is Rietveld 408576698