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/chromeos/policy/cloud_external_data_manager_base_test_util.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/cloud_external_data_manager_base_test_util.cc
diff --git a/chrome/browser/chromeos/policy/cloud_external_data_manager_base_test_util.cc b/chrome/browser/chromeos/policy/cloud_external_data_manager_base_test_util.cc
index 4fa0f3e86dafecf6600b3e3cd6d4c09b84bc3c6b..e9020f648185e402f10a4342bfa2ae56d50c4999 100644
--- a/chrome/browser/chromeos/policy/cloud_external_data_manager_base_test_util.cc
+++ b/chrome/browser/chromeos/policy/cloud_external_data_manager_base_test_util.cc
@@ -22,18 +22,18 @@
namespace policy {
namespace test {
-void ExternalDataFetchCallback(scoped_ptr<std::string>* destination,
+void ExternalDataFetchCallback(std::unique_ptr<std::string>* destination,
const base::Closure& done_callback,
- scoped_ptr<std::string> data) {
+ std::unique_ptr<std::string> data) {
*destination = std::move(data);
done_callback.Run();
}
-scoped_ptr<base::DictionaryValue> ConstructExternalDataReference(
+std::unique_ptr<base::DictionaryValue> ConstructExternalDataReference(
const std::string& url,
const std::string& data) {
const std::string hash = crypto::SHA256HashString(data);
- scoped_ptr<base::DictionaryValue> metadata(new base::DictionaryValue);
+ std::unique_ptr<base::DictionaryValue> metadata(new base::DictionaryValue);
metadata->SetStringWithoutPathExpansion("url", url);
metadata->SetStringWithoutPathExpansion("hash", base::HexEncode(hash.c_str(),
hash.size()));
@@ -42,7 +42,7 @@ scoped_ptr<base::DictionaryValue> ConstructExternalDataReference(
void SetExternalDataReference(CloudPolicyCore* core,
const std::string& policy,
- scoped_ptr<base::DictionaryValue> metadata) {
+ std::unique_ptr<base::DictionaryValue> metadata) {
CloudPolicyStore* store = core->store();
ASSERT_TRUE(store);
PolicyMap policy_map;

Powered by Google App Engine
This is Rietveld 408576698