mash: Move ownership of ShelfDelegate to WmShell

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

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 bd3d1d26e8184eb5ec1826e4dea14af6d77aca24..f3cbcf4834eb3a6e1bcfa59799f5f3f855764939 100644
--- a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc
+++ b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc
@@ -114,14 +114,15 @@ class WallpaperManagerBrowserTest : public InProcessBrowserTest {
     return wallpaper_path;
   }
 
-  // Logs in |account_id|.
+  // Simulates logging in |account_id|.
   void LogIn(const AccountId& account_id, const std::string& user_id_hash) {
     user_manager::UserManager::Get()->UserLoggedIn(account_id, user_id_hash,
                                                    false);
+    ash::Shell::GetInstance()->CreateShelf();

[James Cook, 2016/07/22 23:37:00]

I went with manually creating the shelf, rather than calling something upstream
like ash::Shell::OnLoginUserProfilePrepared(), because it's the only thing this
test needs and we do something similar in other test code:
https://cs-staging.chromium.org/chromium/src/ash/test/test_session_state_dele...

[msw, 2016/07/23 00:02:37]

Would WmShell::SetShelfDelegateForTesting suffice instead? Do it in SetUp?

[James Cook, 2016/07/23 00:38:03]

Done.

     WaitAsyncWallpaperLoadStarted();
   }
 
-  // Logs in |account_id| and sets it as child account.
+  // Simulates logging in |account_id| and sets it as child account.
   void LogInAsChild(const AccountId& account_id,
                     const std::string& user_id_hash) {
     user_manager::UserManager::Get()->UserLoggedIn(account_id, user_id_hash,
@@ -130,6 +131,7 @@ class WallpaperManagerBrowserTest : public InProcessBrowserTest {
         user_manager::UserManager::Get()->FindUserAndModify(account_id);
     user_manager::UserManager::Get()->ChangeUserChildStatus(
         user, true /* is_child */);
+    ash::Shell::GetInstance()->CreateShelf();
   }
 
   int LoadedWallpapers() {