chromeos: Promotes more from WmShell to Shell

ash/common/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/system_tray.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/user/tray_user.h"
 #include "ash/common/system/user/user_view.h"
 #include "ash/common/test/test_session_state_delegate.h"
-#include "ash/common/wm_shell.h"
+#include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/ash_test_helper.h"
 #include "ash/test/test_shell_delegate.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/signin/core/account_id/account_id.h"
 #include "components/user_manager/user_info.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/gfx/animation/animation_container_element.h"
@@ skipping 43 matching lines @@
   tray_ = GetPrimarySystemTray();
   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*>(WmShell::Get()->delegate());
+      static_cast<test::TestShellDelegate*>(Shell::Get()->shell_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(base::WrapUnique(tray_user_[i]));
   }
 }
 
@@ skipping 157 matching lines @@
   const user_manager::UserInfo* second_user = delegate()->GetUserInfo(1);
   EXPECT_EQ(active_user->GetAccountId(), second_user->GetAccountId());
   // Since the name is capitalized, the email should be different than the
   // user_id.
   EXPECT_NE(active_user->GetAccountId().GetUserEmail(),
             second_user->GetDisplayEmail());
   tray()->CloseSystemBubble();
 }
 
 }  // namespace ash