Move even more from WmShell to Shell

ash/common/system/chromeos/brightness/tray_brightness_unittest.cc

Index: ash/common/system/chromeos/brightness/tray_brightness_unittest.cc
diff --git a/ash/common/system/chromeos/brightness/tray_brightness_unittest.cc b/ash/common/system/chromeos/brightness/tray_brightness_unittest.cc
index edc7ac0928f0963dcb47b6cad162d0fbd3dd4be1..46b964cd2bad7653d9ee2d9857a052cbd0e2c9b3 100644
--- a/ash/common/system/chromeos/brightness/tray_brightness_unittest.cc
+++ b/ash/common/system/chromeos/brightness/tray_brightness_unittest.cc
@@ -11,7 +11,7 @@
 #include "ash/common/system/tray/system_tray_item.h"
 #include "ash/common/test/ash_test.h"
 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
-#include "ash/common/wm_shell.h"
+#include "ash/shell.h"
 #include "ui/views/view.h"
 
 namespace ash {
@@ -48,11 +48,11 @@ TEST_F(TrayBrightnessTest, CreateDefaultView) {
 // Tests the construction of the default view while MaximizeMode is active.
 // The BrightnessView should be visible.
 TEST_F(TrayBrightnessTest, CreateDefaultViewDuringMaximizeMode) {
-  WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
+  Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       true);
   std::unique_ptr<views::View> tray(CreateDefaultView());
   EXPECT_TRUE(tray->visible());
-  WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
+  Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       false);
 }
 
@@ -60,10 +60,10 @@ TEST_F(TrayBrightnessTest, CreateDefaultViewDuringMaximizeMode) {
 // BrightnessView, changing the visibility.
 TEST_F(TrayBrightnessTest, DefaultViewVisibilityChangesDuringMaximizeMode) {
   std::unique_ptr<views::View> tray(CreateDefaultView());
-  WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
+  Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       true);
   EXPECT_TRUE(tray->visible());
-  WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
+  Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       false);
   EXPECT_FALSE(tray->visible());
 }
@@ -78,11 +78,11 @@ TEST_F(TrayBrightnessTest, CreateDetailedView) {
 // Tests that when the detailed view is created during MaximizeMode that its
 // BrightnessView is visible.
 TEST_F(TrayBrightnessTest, CreateDetailedViewDuringMaximizeMode) {
-  WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
+  Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       true);
   std::unique_ptr<views::View> tray(CreateDetailedView());
   EXPECT_TRUE(tray->visible());
-  WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
+  Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       false);
 }
 
@@ -90,10 +90,10 @@ TEST_F(TrayBrightnessTest, CreateDetailedViewDuringMaximizeMode) {
 // previously created BrightnessView that belongs to a detailed view.
 TEST_F(TrayBrightnessTest, DetailedViewVisibilityChangesDuringMaximizeMode) {
   std::unique_ptr<views::View> tray(CreateDetailedView());
-  WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
+  Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       true);
   EXPECT_TRUE(tray->visible());
-  WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
+  Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       false);
   EXPECT_TRUE(tray->visible());
 }