chrome/browser/chromeos/login/ui/user_adding_screen_browsertest.cc - Issue 1610823003: Migrate call sites LoginDisplayHostImpl::default_host to LoginDisplayHost.

Unified Diff: chrome/browser/chromeos/login/ui/user_adding_screen_browsertest.cc

Issue 1610823003: Migrate call sites LoginDisplayHostImpl::default_host to LoginDisplayHost. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fix-add-supervised-user

Patch Set: Created 4 years, 11 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/chromeos/login/ui/captive_portal_window_browsertest.cc ('K') | « chrome/browser/chromeos/login/ui/simple_web_view_dialog_browsertest.cc ('k') | chrome/browser/chromeos/login/ui/webui_login_display.cc » ('j') | chrome/browser/chromeos/login/ui/webui_login_display.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/ui/user_adding_screen_browsertest.cc

diff --git a/chrome/browser/chromeos/login/ui/user_adding_screen_browsertest.cc b/chrome/browser/chromeos/login/ui/user_adding_screen_browsertest.cc

index b4e1b988c2de0a5bd68417c00b8cdc3dd524fbf1..973e43d83ba215f1ff7f8aac62eb6d3959aff0b7 100644

--- a/chrome/browser/chromeos/login/ui/user_adding_screen_browsertest.cc

+++ b/chrome/browser/chromeos/login/ui/user_adding_screen_browsertest.cc

@@ -11,7 +11,7 @@

#include "chrome/browser/chromeos/login/lock/screen_locker_tester.h"

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

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

-#include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"

+#include "chrome/browser/chromeos/login/ui/login_display_host.h"

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

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

#include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h"

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

#include "chrome/common/pref_names.h"

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

#include "components/user_manager/user_manager.h"

+#include "content/public/browser/notification_service.h"

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

#include "testing/gtest/include/gtest/gtest.h"

@@ -57,7 +58,7 @@ class UserAddingScreenTest : public LoginManagerTest,

void CheckScreenIsVisible() {

views::View* web_view =

- LoginDisplayHostImpl::default_host()->GetWebUILoginView()->child_at(0);

+ LoginDisplayHost::default_host()->GetWebUILoginView()->child_at(0);

for (views::View* current_view = web_view;

current_view;

current_view = current_view->parent()) {

@@ -119,7 +120,7 @@ IN_PROC_BROWSER_TEST_F(UserAddingScreenTest, CancelAdding) {

ash::Shell::GetInstance()->session_state_delegate()->

GetSessionState());

- EXPECT_TRUE(LoginDisplayHostImpl::default_host() == NULL);

+ EXPECT_TRUE(LoginDisplayHost::default_host() == NULL);

achuithb 2016/01/21 23:14:31 nullptr since you're here

jdufault 2016/01/22 21:14:11 Done.

EXPECT_EQ(1u, user_manager::UserManager::Get()->GetLoggedInUsers().size());

EXPECT_EQ(kTestUsers[0],

user_manager::UserManager::Get()->GetActiveUser()->email());

@@ -155,7 +156,7 @@ IN_PROC_BROWSER_TEST_F(UserAddingScreenTest, AddingSeveralUsers) {

EXPECT_EQ(ash::SessionStateDelegate::SESSION_STATE_ACTIVE,

ash::Shell::GetInstance()->session_state_delegate()->

GetSessionState());

- EXPECT_TRUE(LoginDisplayHostImpl::default_host() == NULL);

+ EXPECT_TRUE(LoginDisplayHost::default_host() == NULL);

achuithb 2016/01/21 23:14:31 nullptr

jdufault 2016/01/22 21:14:11 Done.

ASSERT_EQ(unsigned(i + 1), user_manager->GetLoggedInUsers().size());

}