chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc - Issue 1610823003: Migrate call sites LoginDisplayHostImpl::default_host to LoginDisplayHost.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_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/webui_login_display.cc ('K') | « chrome/browser/chromeos/login/ui/webui_login_display.cc ('k') | chrome/browser/chromeos/login/wizard_controller_browsertest.cc » ('j') | chrome/browser/chromeos/options/network_config_view.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc

diff --git a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc

index 07a7f8608a175a5218d22288f85c8853556723dd..4949c603da52668930a8689fae6841453c757756 100644

--- a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc

+++ b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc

@@ -21,13 +21,14 @@

#include "base/run_loop.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/users/wallpaper/wallpaper_manager.h"

#include "chrome/browser/chromeos/policy/cloud_external_data_manager_base_test_util.h"

#include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h"

#include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h"

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

#include "chrome/browser/profiles/profile.h"

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

#include "chrome/common/chrome_paths.h"

#include "chromeos/chromeos_paths.h"

#include "chromeos/chromeos_switches.h"

@@ -375,9 +376,10 @@ IN_PROC_BROWSER_TEST_F(WallpaperManagerPolicyTest,

// Select the second pod (belonging to user 1).

ASSERT_TRUE(content::ExecuteScript(

- static_cast<chromeos::LoginDisplayHostImpl*>(

- chromeos::LoginDisplayHostImpl::default_host())->GetOobeUI()->

- web_ui()->GetWebContents(),

+ chromeos::LoginDisplayHost::default_host()

achuithb 2016/01/21 23:14:31 drop chromeos::

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

+ ->GetOobeUI()

+ ->web_ui()

+ ->GetWebContents(),

"document.getElementsByClassName('pod')[1].focus();"));

RunUntilWallpaperChangeCount(2);

ASSERT_EQ(kRedImageColor, GetAverageBackgroundColor());