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

Unified Diff: chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.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/login/enrollment/auto_enrollment_controller.h
diff --git a/chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.h b/chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.h
index cb87758d04241fe7c4c5dbcfc6d2252a8af92911..70392ce4ecf30763202db4dd4c5742e5177aacc5 100644
--- a/chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.h
+++ b/chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.h
@@ -5,12 +5,12 @@
#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_AUTO_ENROLLMENT_CONTROLLER_H_
#define CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_AUTO_ENROLLMENT_CONTROLLER_H_
+#include <memory>
#include <string>
#include <vector>
#include "base/callback_list.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/timer/timer.h"
#include "chrome/browser/chromeos/policy/auto_enrollment_client.h"
@@ -60,7 +60,7 @@ class AutoEnrollmentController {
void Retry();
// Registers a callback to invoke on state changes.
- scoped_ptr<ProgressCallbackList::Subscription> RegisterProgressCallback(
+ std::unique_ptr<ProgressCallbackList::Subscription> RegisterProgressCallback(
const ProgressCallbackList::CallbackType& callback);
policy::AutoEnrollmentState state() const { return state_; }
@@ -82,7 +82,7 @@ class AutoEnrollmentController {
policy::AutoEnrollmentState state_;
ProgressCallbackList progress_callbacks_;
- scoped_ptr<policy::AutoEnrollmentClient> client_;
+ std::unique_ptr<policy::AutoEnrollmentClient> client_;
// This timer acts as a belt-and-suspenders safety for the case where one of
// the asynchronous steps required to make the auto-enrollment decision

Powered by Google App Engine
This is Rietveld 408576698