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

Unified Diff: chrome/browser/chromeos/login/users/user_manager_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/chromeos/login/users/user_manager_unittest.cc
diff --git a/chrome/browser/chromeos/login/users/user_manager_unittest.cc b/chrome/browser/chromeos/login/users/user_manager_unittest.cc
index 8aa2f16d27465f1e6a5c3427032940ae000b2505..ed16b5d15210f272a79596a1ff3230728487a8ec 100644
--- a/chrome/browser/chromeos/login/users/user_manager_unittest.cc
+++ b/chrome/browser/chromeos/login/users/user_manager_unittest.cc
@@ -12,7 +12,6 @@
#include "base/run_loop.h"
#include "base/values.h"
#include "chrome/browser/browser_process.h"
-#include "chrome/browser/chromeos/login/users/user.h"
#include "chrome/browser/chromeos/login/users/user_manager.h"
#include "chrome/browser/chromeos/login/users/user_manager_impl.h"
#include "chrome/browser/chromeos/settings/cros_settings.h"
@@ -27,6 +26,7 @@
#include "chromeos/dbus/fake_dbus_thread_manager.h"
#include "chromeos/settings/cros_settings_names.h"
#include "chromeos/settings/cros_settings_provider.h"
+#include "components/user_manager/user.h"
#include "content/public/common/content_switches.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -185,7 +185,7 @@ TEST_F(UserManagerTest, RemoveAllExceptOwnerFromList) {
"user1@invalid.domain", "owner@invalid.domain", false);
ResetUserManager();
- const UserList* users = &UserManager::Get()->GetUsers();
+ const user_manager::UserList* users = &UserManager::Get()->GetUsers();
ASSERT_EQ(3U, users->size());
EXPECT_EQ((*users)[0]->email(), "user1@invalid.domain");
EXPECT_EQ((*users)[1]->email(), "user0@invalid.domain");
@@ -210,7 +210,7 @@ TEST_F(UserManagerTest, RegularUserLoggedInAsEphemeral) {
"user0@invalid.domain", "user0@invalid.domain", false);
ResetUserManager();
- const UserList* users = &UserManager::Get()->GetUsers();
+ const user_manager::UserList* users = &UserManager::Get()->GetUsers();
EXPECT_EQ(1U, users->size());
EXPECT_EQ((*users)[0]->email(), "owner@invalid.domain");
}

Powered by Google App Engine
This is Rietveld 408576698