mash: Migrate ShellDelegate ownership and access to WmShell.

ash/system/user/tray_user_unittest.cc

 // Copyright 2013 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 <vector>
 
+#include "ash/common/shell_delegate.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/user/tray_user_separator.h"
+#include "ash/common/wm_shell.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"

[James Cook, 2016/07/06 21:27:27]

remove?

[msw, 2016/07/06 21:58:56]

Used for GetPrimaryRootWindow[Controller]; I'll leave this for followup.

-#include "ash/shell_delegate.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/user/tray_user.h"
 #include "ash/system/user/user_view.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/ash_test_helper.h"
 #include "ash/test/test_session_state_delegate.h"
 #include "ash/test/test_shell_delegate.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/signin/core/account_id/account_id.h"
 #include "components/user_manager/user_info.h"
@@ skipping 49 matching lines @@
   tray_ = Shell::GetPrimaryRootWindowController()->GetSystemTray();
   delegate_ = test::AshTestHelper::GetTestSessionStateDelegate();
 }
 
 void TrayUserTest::InitializeParameters(int users_logged_in,
                                         bool multiprofile) {
   // Set our default assumptions. Note that it is sufficient to set these
   // after everything was created.
   delegate_->set_logged_in_users(users_logged_in);
   test::TestShellDelegate* shell_delegate =
-      static_cast<test::TestShellDelegate*>(Shell::GetInstance()->delegate());
+      static_cast<test::TestShellDelegate*>(WmShell::Get()->delegate());
   shell_delegate->set_multi_profiles_enabled(multiprofile);
 
   // Instead of using the existing tray panels we create new ones which makes
   // the access easier.
   for (int i = 0; i < delegate_->GetMaximumNumberOfLoggedInUsers(); i++) {
     tray_user_.push_back(new TrayUser(tray_, i));
     tray_->AddTrayItem(tray_user_[i]);
   }
   // We then add also the separator.
   tray_user_separator_ = new TrayUserSeparator(tray_);
@@ skipping 168 matching lines @@
   // Since the name is capitalized, the email should be different then the
   // user_id.
   EXPECT_NE(active_user->GetAccountId().GetUserEmail(),
             second_user->GetEmail());
   tray()->CloseSystemBubble();
 }
 
 #endif
 
 }  // namespace ash