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

Unified Diff: chrome/browser/chromeos/policy/device_local_account_policy_provider.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_local_account_policy_provider.h
diff --git a/chrome/browser/chromeos/policy/device_local_account_policy_provider.h b/chrome/browser/chromeos/policy/device_local_account_policy_provider.h
index 16bfe123ef0c80ce35130bebd1c37b50c4f50123..2f12cbfa77261c9944fa98c26cc0c8db5e14797c 100644
--- a/chrome/browser/chromeos/policy/device_local_account_policy_provider.h
+++ b/chrome/browser/chromeos/policy/device_local_account_policy_provider.h
@@ -5,12 +5,12 @@
#ifndef CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_LOCAL_ACCOUNT_POLICY_PROVIDER_H_
#define CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_LOCAL_ACCOUNT_POLICY_PROVIDER_H_
+#include <memory>
#include <string>
#include "base/compiler_specific.h"
#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/policy/device_local_account_external_data_manager.h"
#include "chrome/browser/chromeos/policy/device_local_account_policy_service.h"
@@ -33,13 +33,13 @@ class DeviceLocalAccountPolicyProvider
DeviceLocalAccountPolicyProvider(
const std::string& user_id,
DeviceLocalAccountPolicyService* service,
- scoped_ptr<PolicyMap> chrome_policy_overrides);
+ std::unique_ptr<PolicyMap> chrome_policy_overrides);
~DeviceLocalAccountPolicyProvider() override;
// Factory function to create and initialize a provider for |user_id|. Returns
// NULL if |user_id| is not a device-local account or user policy isn't
// applicable for user_id's user type.
- static scoped_ptr<DeviceLocalAccountPolicyProvider> Create(
+ static std::unique_ptr<DeviceLocalAccountPolicyProvider> Create(
const std::string& user_id,
DeviceLocalAccountPolicyService* service);
@@ -71,7 +71,7 @@ class DeviceLocalAccountPolicyProvider
// A policy map providing overrides to apply on top of the Chrome policy
// received from |service_|. This is used to fix certain policies for public
// sessions regardless of what's actually specified in policy.
- scoped_ptr<PolicyMap> chrome_policy_overrides_;
+ std::unique_ptr<PolicyMap> chrome_policy_overrides_;
bool store_initialized_;
bool waiting_for_policy_refresh_;

Powered by Google App Engine
This is Rietveld 408576698