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

Unified Diff: chrome/browser/ui/webui/chromeos/login/signin_userlist_unittest.cc

Issue 398753004: [cros] Move User class to user_manager component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 5 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/ui/webui/chromeos/login/signin_userlist_unittest.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/signin_userlist_unittest.cc b/chrome/browser/ui/webui/chromeos/login/signin_userlist_unittest.cc
index a6caeccad0fe7643c715bb10de010338690da167..0aa3deaa0be81b4883e9d58e7e4c00e62ee46b9c 100644
--- a/chrome/browser/ui/webui/chromeos/login/signin_userlist_unittest.cc
+++ b/chrome/browser/ui/webui/chromeos/login/signin_userlist_unittest.cc
@@ -7,10 +7,10 @@
#include "chrome/browser/chromeos/login/users/fake_user_manager.h"
#include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h"
#include "chrome/browser/chromeos/login/users/multi_profile_user_controller_delegate.h"
-#include "chrome/browser/chromeos/login/users/user.h"
#include "chrome/browser/signin/screenlock_bridge.h"
#include "chrome/test/base/testing_browser_process.h"
#include "chrome/test/base/testing_profile_manager.h"
+#include "components/user_manager/user.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace {
@@ -79,10 +79,9 @@ class SigninPrepareUserListTest
TEST_F(SigninPrepareUserListTest, AlwaysKeepOwnerInList) {
EXPECT_LT(kMaxUsers, fake_user_manager_->GetUsers().size());
- UserList users_to_send = UserSelectionScreen::PrepareUserListForSending(
- fake_user_manager_->GetUsers(),
- kOwner,
- true /* is signin to add */);
+ user_manager::UserList users_to_send =
+ UserSelectionScreen::PrepareUserListForSending(
+ fake_user_manager_->GetUsers(), kOwner, true /* is signin to add */);
EXPECT_EQ(kMaxUsers, users_to_send.size());
EXPECT_EQ(kOwner, users_to_send.back()->email());
@@ -100,10 +99,9 @@ TEST_F(SigninPrepareUserListTest, AlwaysKeepOwnerInList) {
}
TEST_F(SigninPrepareUserListTest, PublicAccounts) {
- UserList users_to_send = UserSelectionScreen::PrepareUserListForSending(
- fake_user_manager_->GetUsers(),
- kOwner,
- true /* is signin to add */);
+ user_manager::UserList users_to_send =
+ UserSelectionScreen::PrepareUserListForSending(
+ fake_user_manager_->GetUsers(), kOwner, true /* is signin to add */);
EXPECT_EQ(kMaxUsers, users_to_send.size());
EXPECT_EQ("a0@gmail.com", users_to_send.front()->email());

Powered by Google App Engine
This is Rietveld 408576698