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

Unified Diff: chrome/browser/chromeos/policy/device_cloud_policy_initializer.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/device_cloud_policy_initializer.h
diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_initializer.h b/chrome/browser/chromeos/policy/device_cloud_policy_initializer.h
index 69d1bcebdee189cb25583ad232ab9aed21bc1e2b..926df11200e7f2c743efd748e6ffd415f4c8edd9 100644
--- a/chrome/browser/chromeos/policy/device_cloud_policy_initializer.h
+++ b/chrome/browser/chromeos/policy/device_cloud_policy_initializer.h
@@ -6,13 +6,13 @@
#define CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_CLOUD_POLICY_INITIALIZER_H_
#include <bitset>
+#include <memory>
#include <string>
#include "base/callback_forward.h"
#include "base/compiler_specific.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "chrome/browser/chromeos/policy/server_backed_state_keys_broker.h"
#include "components/policy/core/common/cloud/cloud_policy_client.h"
#include "components/policy/core/common/cloud/cloud_policy_constants.h"
@@ -99,11 +99,11 @@ class DeviceCloudPolicyInitializer : public CloudPolicyStore::Observer {
EnrollmentStatus status);
// Creates a new CloudPolicyClient.
- scoped_ptr<CloudPolicyClient> CreateClient(
+ std::unique_ptr<CloudPolicyClient> CreateClient(
DeviceManagementService* device_management_service);
void TryToCreateClient();
- void StartConnection(scoped_ptr<CloudPolicyClient> client);
+ void StartConnection(std::unique_ptr<CloudPolicyClient> client);
PrefService* local_state_;
DeviceManagementService* enterprise_service_;
@@ -116,7 +116,7 @@ class DeviceCloudPolicyInitializer : public CloudPolicyStore::Observer {
bool is_initialized_;
// Non-NULL if there is an enrollment operation pending.
- scoped_ptr<EnrollmentHandlerChromeOS> enrollment_handler_;
+ std::unique_ptr<EnrollmentHandlerChromeOS> enrollment_handler_;
ServerBackedStateKeysBroker::Subscription state_keys_update_subscription_;

Powered by Google App Engine
This is Rietveld 408576698