chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc - Issue 2734933004: ash: Use SessionController instead of SessionStateDelegate

Unified Diff: chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc

Issue 2734933004: ash: Use SessionController instead of SessionStateDelegate (Closed)

Patch Set: rebase Created 3 years, 9 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

« chrome/browser/chromeos/login/session/chrome_session_manager.cc ('K') | « chrome/browser/chromeos/login/session/user_session_manager.cc ('k') | chrome/browser/chromeos/system/tray_accessibility_browsertest.cc » ('j') | ui/aura/mus/window_tree_client.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 2609a93b842bc4f1db0d4629999f5e8d0890902f..f549c17bc2f14770159ea90eadf0b1a287529624 100644

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

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

@@ -20,6 +20,7 @@

#include "base/time/time.h"

#include "base/values.h"

#include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_test_utils.h"

+#include "chrome/browser/ui/ash/session_controller_client.h"

#include "chrome/common/chrome_paths.h"

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

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

@@ -115,9 +116,9 @@ class WallpaperManagerBrowserTest : public InProcessBrowserTest {

// Logs in |account_id|.

void LogIn(const AccountId& account_id, const std::string& user_id_hash) {

SessionManager::Get()->CreateSession(account_id, user_id_hash);

- // Adding a secondary display creates a shelf on that display, which

- // assumes a shelf on the primary display if the user was logged in.

- ash::WmShell::Get()->CreateShelfView();

+ SessionManager::Get()->SessionStarted();

+ // Flush to ensure the created session and ACTIVE state reaches ash.

+ SessionControllerClient::FlushForTesting();

xiyuan 2017/03/17 07:08:16 This would cause shelf to be created now.

James Cook 2017/03/17 17:14:37 Acknowledged. Aside, not related to this CL: I've

xiyuan 2017/03/17 22:52:03 I have not looked at how wallpaper is migrated to

WaitAsyncWallpaperLoadStarted();

}