mash: Move ownership of ShelfDelegate to WmShell

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/desktop_background/desktop_background_controller.h"
 #include "ash/desktop_background/desktop_background_controller_observer.h"
@@ skipping 96 matching lines @@
       const std::string& id) {
     base::FilePath wallpaper_path =
         WallpaperManager::Get()->GetCustomWallpaperPath(sub_dir,
                                                         wallpaper_files_id, id);
     if (!base::DirectoryExists(wallpaper_path.DirName()))
       base::CreateDirectory(wallpaper_path.DirName());
 
     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,
                                                    false);
     user_manager::User* user =
         user_manager::UserManager::Get()->FindUserAndModify(account_id);
     user_manager::UserManager::Get()->ChangeUserChildStatus(
         user, true /* is_child */);
+    ash::Shell::GetInstance()->CreateShelf();
   }
 
   int LoadedWallpapers() {
     return WallpaperManager::Get()->loaded_wallpapers_for_test();
   }
 
   void CacheUserWallpaper(const AccountId& account_id) {
     WallpaperManager::Get()->CacheUserWallpaper(account_id);
   }
 
@@ skipping 710 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