Move yet 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/session/session_controller.h"
 #include "ash/common/shell_delegate.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray/tray_constants.h"
@@ skipping 37 matching lines @@
   void ShowTrayMenu(ui::test::EventGenerator* generator);
 
   // Move the mouse over the user item.
   void MoveOverUserItem(ui::test::EventGenerator* generator, int index);
 
   // Click on the user item. Note that the tray menu needs to be shown.
   void ClickUserItem(ui::test::EventGenerator* generator, int index);
 
   // Accessors to various system components.
   SystemTray* tray() { return tray_; }
-  SessionController* controller() {
-    return WmShell::Get()->session_controller();
-  }
+  SessionController* controller() { return Shell::Get()->session_controller(); }
   TrayUser* tray_user(int index) { return tray_user_[index]; }
 
  private:
   SystemTray* tray_ = nullptr;
 
   // Note that the ownership of these items is on the shelf.
   std::vector<TrayUser*> tray_user_;
 
   DISALLOW_COPY_AND_ASSIGN(TrayUserTest);
 };
@@ skipping 192 matching lines @@
 
   const mojom::UserSession* active_user = controller()->GetUserSession(0);
   EXPECT_EQ(active_user->account_id, second_user->account_id);
   // Since the name is capitalized, the email should be different than the
   // user_id.
   EXPECT_NE(active_user->account_id.GetUserEmail(), second_user->display_email);
   tray()->CloseSystemBubble();
 }
 
 }  // namespace ash