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

Unified Diff: chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper.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/enterprise_enrollment_helper.h
diff --git a/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper.h b/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper.h
index 070901b4a28f9c23e6726d3fd16afc060908d189..cd9cb8fd08348ab81925d5396234ec1d2d26f963 100644
--- a/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper.h
+++ b/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper.h
@@ -5,11 +5,11 @@
#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_ENTERPRISE_ENROLLMENT_HELPER_H_
#define CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_ENTERPRISE_ENROLLMENT_HELPER_H_
+#include <memory>
#include <string>
#include "base/callback_forward.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "chrome/browser/chromeos/policy/device_cloud_policy_initializer.h"
class GoogleServiceAuthError;
@@ -67,7 +67,7 @@ class EnterpriseEnrollmentHelper {
};
// Factory method. Caller takes ownership of the returned object.
- static scoped_ptr<EnterpriseEnrollmentHelper> Create(
+ static std::unique_ptr<EnterpriseEnrollmentHelper> Create(
EnrollmentStatusConsumer* status_consumer,
const policy::EnrollmentConfig& enrollment_config,
const std::string& enrolling_user_domain);

Powered by Google App Engine
This is Rietveld 408576698