ash: Use SessionController instead of SessionStateDelegate

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
 
 #include <stddef.h>
 
 #include "ash/common/wallpaper/wallpaper_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/strings/string_number_conversions.h"
 #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"
 #include "chromeos/chromeos_switches.h"
 #include "components/prefs/scoped_user_pref_update.h"
 #include "components/session_manager/core/session_manager.h"
 #include "components/signin/core/account_id/account_id.h"
 #include "components/user_manager/user.h"
 #include "components/user_manager/user_manager.h"
 #include "components/user_manager/user_names.h"
@@ skipping 75 matching lines @@
                                                         wallpaper_files_id, id);
     if (!base::DirectoryExists(wallpaper_path.DirName()))
       base::CreateDirectory(wallpaper_path.DirName());
 
     return wallpaper_path;
   }
 
   // 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 often had trouble with these wallpaper tests
while working on mustash. I wonder if there's something fundamentally wrong with
how they are initializing things.

[xiyuan, 2017/03/17 22:52:03]

I have not looked at how wallpaper is migrated to mash. But I would not be
surprised if there is more work needed there.

     WaitAsyncWallpaperLoadStarted();
   }
 
   // Logs in |account_id| and sets it as child account.
   void LogInAsChild(const AccountId& account_id,
                     const std::string& user_id_hash) {
     SessionManager::Get()->CreateSession(account_id, user_id_hash);
     user_manager::User* user =
         user_manager::UserManager::Get()->FindUserAndModify(account_id);
     user_manager::UserManager::Get()->ChangeUserChildStatus(
@@ skipping 694 matching lines @@
 
   WallpaperManager::Get()->SetDefaultWallpaperNow(EmptyAccountId());
   wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished();
 
   EXPECT_TRUE(wallpaper_manager_test_utils::ImageIsNearColor(
       controller_->GetWallpaper(),
       wallpaper_manager_test_utils::kSmallDefaultWallpaperColor));
 }
 
 }  // namespace chromeos