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

Unified Diff: components/policy/core/common/policy_loader_win.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: Address comments and use namespace alias 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/policy_loader_win.h
diff --git a/components/policy/core/common/policy_loader_win.h b/components/policy/core/common/policy_loader_win.h
index d8c8221d995ebe777ea694b53bf4bc6e1d60505f..c1195b1b7b022b89fbf0ee8405ad85c1919069d9 100644
--- a/components/policy/core/common/policy_loader_win.h
+++ b/components/policy/core/common/policy_loader_win.h
@@ -8,10 +8,11 @@
#include <windows.h>
#include <userenv.h>
+#include <memory>
+
#include "base/files/file_path.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/strings/string16.h"
#include "base/synchronization/waitable_event.h"
#include "base/win/object_watcher.h"
@@ -60,13 +61,13 @@ class POLICY_EXPORT PolicyLoaderWin
~PolicyLoaderWin() override;
// Creates a policy loader that uses the Win API to access GPO.
- static scoped_ptr<PolicyLoaderWin> Create(
+ static std::unique_ptr<PolicyLoaderWin> Create(
scoped_refptr<base::SequencedTaskRunner> task_runner,
const base::string16& chrome_policy_key);
// AsyncPolicyLoader implementation.
void InitOnBackgroundThread() override;
- scoped_ptr<PolicyBundle> Load() override;
+ std::unique_ptr<PolicyBundle> Load() override;
private:
// Reads Chrome Policy from a PReg file at the given path and stores the
« no previous file with comments | « components/policy/core/common/policy_loader_mac_unittest.cc ('k') | components/policy/core/common/policy_loader_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698