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

Unified Diff: chrome/browser/chromeos/login/users/mock_user_manager.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/users/mock_user_manager.h
diff --git a/chrome/browser/chromeos/login/users/mock_user_manager.h b/chrome/browser/chromeos/login/users/mock_user_manager.h
index 8791db30f7b4d4d384247ce3d8599171f8a922fc..8f86804ab71fb6aa19d5fa71f96c5c71e8f1f52d 100644
--- a/chrome/browser/chromeos/login/users/mock_user_manager.h
+++ b/chrome/browser/chromeos/login/users/mock_user_manager.h
@@ -168,9 +168,9 @@ class MockUserManager : public ChromeUserManager {
// MockUserManager become invalid.
void ClearUserList();
- scoped_ptr<UserFlow> user_flow_;
- scoped_ptr<MockUserImageManager> user_image_manager_;
- scoped_ptr<FakeSupervisedUserManager> supervised_user_manager_;
+ std::unique_ptr<UserFlow> user_flow_;
+ std::unique_ptr<MockUserImageManager> user_image_manager_;
+ std::unique_ptr<FakeSupervisedUserManager> supervised_user_manager_;
user_manager::UserList user_list_;
// TODO (alemate): remove temporary_owner_account_id_ as soon as
// User::GetAccountId will

Powered by Google App Engine
This is Rietveld 408576698