chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc - Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager

Unified Diff: chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc

Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: similarity Created 6 years, 4 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

« chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.cc ('K') | « chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc ('k') | chrome/browser/ui/webui/options/chromeos/user_image_source.cc » ('j') | components/user_manager/user_manager_base.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc

diff --git a/chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc b/chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc

index a8255db0c2d97759c741767ff2d9d8417552fc4e..f837dfa811a33a219d74c2b67a402ecf87d68da3 100644

--- a/chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc

+++ b/chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc

@@ -9,7 +9,6 @@

#include "chrome/browser/chromeos/login/login_manager_test.h"

#include "chrome/browser/chromeos/login/startup_utils.h"

#include "chrome/browser/chromeos/login/ui/user_adding_screen.h"

-#include "chrome/browser/chromeos/login/users/user_manager.h"

#include "chrome/browser/chromeos/profiles/profile_helper.h"

#include "chrome/browser/chromeos/settings/cros_settings.h"

#include "chrome/browser/chromeos/settings/stub_cros_settings_provider.h"

@@ -19,6 +18,7 @@

#include "chrome/common/pref_names.h"

#include "chrome/test/base/ui_test_utils.h"

#include "chromeos/settings/cros_settings_names.h"

+#include "components/user_manager/user_manager.h"

#include "content/public/browser/web_contents.h"

#include "content/public/test/browser_test_utils.h"

#include "content/public/test/test_utils.h"

@@ -273,7 +273,7 @@ IN_PROC_BROWSER_TEST_F(SharedOptionsTest, SharedOptions) {

content::RunAllPendingInMessageLoop();

AddUser(kTestNonOwner);

- UserManager* manager = UserManager::Get();

+ user_manager::UserManager* manager = user_manager::UserManager::Get();

ASSERT_EQ(2u, manager->GetLoggedInUsers().size());

{

SCOPED_TRACE("Checking settings for owner, primary user.");

@@ -304,7 +304,7 @@ IN_PROC_BROWSER_TEST_F(SharedOptionsTest, ScreenLockPreferencePrimary) {

content::RunAllPendingInMessageLoop();

AddUser(kTestNonOwner);

- UserManager* manager = UserManager::Get();

+ user_manager::UserManager* manager = user_manager::UserManager::Get();

const user_manager::User* user1 = manager->FindUser(kTestOwner);

const user_manager::User* user2 = manager->FindUser(kTestNonOwner);

@@ -375,7 +375,7 @@ IN_PROC_BROWSER_TEST_F(SharedOptionsTest, ScreenLockPreferenceSecondary) {

content::RunAllPendingInMessageLoop();

AddUser(kTestNonOwner);

- UserManager* manager = UserManager::Get();

+ user_manager::UserManager* manager = user_manager::UserManager::Get();

const user_manager::User* user1 = manager->FindUser(kTestOwner);

const user_manager::User* user2 = manager->FindUser(kTestNonOwner);