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

Unified Diff: chrome/browser/chromeos/policy/browser_policy_connector_chromeos.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/browser_policy_connector_chromeos.h
diff --git a/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h b/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h
index 1039ed5ea75869b38cd025375494f0d4f24e1ca0..5b54e2ceea5fade7cc5dfcb494d43d55f279268d 100644
--- a/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h
+++ b/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h
@@ -5,12 +5,12 @@
#ifndef CHROME_BROWSER_CHROMEOS_POLICY_BROWSER_POLICY_CONNECTOR_CHROMEOS_H_
#define CHROME_BROWSER_CHROMEOS_POLICY_BROWSER_POLICY_CONNECTOR_CHROMEOS_H_
+#include <memory>
#include <set>
#include <string>
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "chrome/browser/chromeos/login/users/affiliation.h"
#include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
@@ -125,11 +125,11 @@ class BrowserPolicyConnectorChromeOS
// Sets the consumer management service for testing.
void SetConsumerManagementServiceForTesting(
- scoped_ptr<ConsumerManagementService> service);
+ std::unique_ptr<ConsumerManagementService> service);
// Sets the device cloud policy initializer for testing.
void SetDeviceCloudPolicyInitializerForTesting(
- scoped_ptr<DeviceCloudPolicyInitializer> initializer);
+ std::unique_ptr<DeviceCloudPolicyInitializer> initializer);
// Sets the install attributes for testing. Must be called before the browser
// is created. RemoveInstallAttributesForTesting must be called after the test
@@ -156,19 +156,21 @@ class BrowserPolicyConnectorChromeOS
void RestartDeviceCloudPolicyInitializer();
// Components of the device cloud policy implementation.
- scoped_ptr<ServerBackedStateKeysBroker> state_keys_broker_;
- scoped_ptr<EnterpriseInstallAttributes> install_attributes_;
- scoped_ptr<AffiliatedInvalidationServiceProvider>
+ std::unique_ptr<ServerBackedStateKeysBroker> state_keys_broker_;
+ std::unique_ptr<EnterpriseInstallAttributes> install_attributes_;
+ std::unique_ptr<AffiliatedInvalidationServiceProvider>
affiliated_invalidation_service_provider_;
- scoped_ptr<ConsumerManagementService> consumer_management_service_;
+ std::unique_ptr<ConsumerManagementService> consumer_management_service_;
DeviceCloudPolicyManagerChromeOS* device_cloud_policy_manager_;
PrefService* local_state_;
- scoped_ptr<DeviceManagementService> consumer_device_management_service_;
- scoped_ptr<DeviceCloudPolicyInitializer> device_cloud_policy_initializer_;
- scoped_ptr<DeviceLocalAccountPolicyService>
+ std::unique_ptr<DeviceManagementService> consumer_device_management_service_;
+ std::unique_ptr<DeviceCloudPolicyInitializer>
+ device_cloud_policy_initializer_;
+ std::unique_ptr<DeviceLocalAccountPolicyService>
device_local_account_policy_service_;
- scoped_ptr<AffiliatedCloudPolicyInvalidator> device_cloud_policy_invalidator_;
- scoped_ptr<AffiliatedRemoteCommandsInvalidator>
+ std::unique_ptr<AffiliatedCloudPolicyInvalidator>
+ device_cloud_policy_invalidator_;
+ std::unique_ptr<AffiliatedRemoteCommandsInvalidator>
device_remote_commands_invalidator_;
// This policy provider is used on Chrome OS to feed user policy into the
@@ -179,7 +181,7 @@ class BrowserPolicyConnectorChromeOS
// pointer to get to the ProxyPolicyProvider at SetUserPolicyDelegate().
ProxyPolicyProvider* global_user_cloud_policy_provider_;
- scoped_ptr<NetworkConfigurationUpdater> network_configuration_updater_;
+ std::unique_ptr<NetworkConfigurationUpdater> network_configuration_updater_;
base::WeakPtrFactory<BrowserPolicyConnectorChromeOS> weak_ptr_factory_;

Powered by Google App Engine
This is Rietveld 408576698