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

Unified Diff: components/policy/core/common/cloud/cloud_policy_client.h

Issue 1902633006: Convert //components/policy 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: components/policy/core/common/cloud/cloud_policy_client.h
diff --git a/components/policy/core/common/cloud/cloud_policy_client.h b/components/policy/core/common/cloud/cloud_policy_client.h
index 888a3c25d7a7e026b69ca74c44f16b128c83c2f2..2fb9f4bdc5c24a312649adeb212d321c6e072943 100644
--- a/components/policy/core/common/cloud/cloud_policy_client.h
+++ b/components/policy/core/common/cloud/cloud_policy_client.h
@@ -8,6 +8,7 @@
#include <stdint.h>
#include <map>
+#include <memory>
#include <set>
#include <string>
#include <utility>
@@ -15,7 +16,6 @@
#include "base/callback.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/scoped_vector.h"
#include "base/observer_list.h"
#include "base/time/time.h"
@@ -153,7 +153,7 @@ class POLICY_EXPORT CloudPolicyClient {
// previous commands. A nullptr indicates that no commands have finished
// execution.
virtual void FetchRemoteCommands(
- scoped_ptr<RemoteCommandJob::UniqueIDType> last_command_id,
+ std::unique_ptr<RemoteCommandJob::UniqueIDType> last_command_id,
const std::vector<enterprise_management::RemoteCommandResult>&
command_results,
const RemoteCommandCallback& callback);
@@ -378,7 +378,7 @@ class POLICY_EXPORT CloudPolicyClient {
// Only one outstanding policy fetch is allowed, so this is tracked in
// its own member variable.
- scoped_ptr<DeviceManagementRequestJob> policy_fetch_request_job_;
+ std::unique_ptr<DeviceManagementRequestJob> policy_fetch_request_job_;
// All of the outstanding non-policy-fetch request jobs. These jobs are
// silently cancelled if Unregister() is called.

Powered by Google App Engine
This is Rietveld 408576698