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

Unified Diff: chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper.cc

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/enterprise_enrollment_helper.cc
diff --git a/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper.cc b/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper.cc
index c30c452f4a6186caf8c9d77c1ec78f41e50b07f1..81054184a776c42f7d326633cdc817f28ebc6d7a 100644
--- a/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper.cc
+++ b/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper.h"
#include "base/logging.h"
+#include "base/memory/ptr_util.h"
#include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper_impl.h"
namespace chromeos {
@@ -22,7 +23,7 @@ void EnterpriseEnrollmentHelper::SetupEnrollmentHelperMock(
}
// static
-scoped_ptr<EnterpriseEnrollmentHelper> EnterpriseEnrollmentHelper::Create(
+std::unique_ptr<EnterpriseEnrollmentHelper> EnterpriseEnrollmentHelper::Create(
EnrollmentStatusConsumer* status_consumer,
const policy::EnrollmentConfig& enrollment_config,
const std::string& enrolling_user_domain) {
@@ -34,10 +35,10 @@ scoped_ptr<EnterpriseEnrollmentHelper> EnterpriseEnrollmentHelper::Create(
create_mock_enrollment_helper_ = nullptr;
EnterpriseEnrollmentHelper* helper = enrollment_helper_allocator(
status_consumer, enrollment_config, enrolling_user_domain);
- return make_scoped_ptr(helper);
+ return base::WrapUnique(helper);
}
- return make_scoped_ptr(new EnterpriseEnrollmentHelperImpl(
+ return base::WrapUnique(new EnterpriseEnrollmentHelperImpl(
status_consumer, enrollment_config, enrolling_user_domain));
}

Powered by Google App Engine
This is Rietveld 408576698