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

Unified Diff: chrome/browser/chromeos/policy/cloud_external_data_manager_base_test_util.h

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.h
diff --git a/chrome/browser/chromeos/policy/cloud_external_data_manager_base_test_util.h b/chrome/browser/chromeos/policy/cloud_external_data_manager_base_test_util.h
index d1b85910652c335c66c7fae3664048e3877c9435..7ae9fb3d213834360a9e5c7298c010b1c5ae5c32 100644
--- a/chrome/browser/chromeos/policy/cloud_external_data_manager_base_test_util.h
+++ b/chrome/browser/chromeos/policy/cloud_external_data_manager_base_test_util.h
@@ -5,10 +5,10 @@
#ifndef CHROME_BROWSER_CHROMEOS_POLICY_CLOUD_EXTERNAL_DATA_MANAGER_BASE_TEST_UTIL_H_
#define CHROME_BROWSER_CHROMEOS_POLICY_CLOUD_EXTERNAL_DATA_MANAGER_BASE_TEST_UTIL_H_
+#include <memory>
#include <string>
#include "base/callback_forward.h"
-#include "base/memory/scoped_ptr.h"
namespace base {
class DictionaryValue;
@@ -22,13 +22,13 @@ namespace test {
// Passes |data| to |destination| and invokes |done_callback| to indicate that
// the |data| has been retrieved.
-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);
// Constructs a value that points a policy referencing external data at |url|
// and sets the expected hash of the external data to that of |data|.
-scoped_ptr<base::DictionaryValue> ConstructExternalDataReference(
+std::unique_ptr<base::DictionaryValue> ConstructExternalDataReference(
const std::string& url,
const std::string& data);
@@ -39,7 +39,7 @@ scoped_ptr<base::DictionaryValue> ConstructExternalDataReference(
// removed.
void SetExternalDataReference(CloudPolicyCore* core,
const std::string& policy,
- scoped_ptr<base::DictionaryValue> metadata);
+ std::unique_ptr<base::DictionaryValue> metadata);
} // namespace test
} // namespace policy

Powered by Google App Engine
This is Rietveld 408576698