Move even more from WmShell to Shell

ash/common/metrics/pointer_metrics_recorder_unittest.cc

Index: ash/common/metrics/pointer_metrics_recorder_unittest.cc
diff --git a/ash/common/metrics/pointer_metrics_recorder_unittest.cc b/ash/common/metrics/pointer_metrics_recorder_unittest.cc
index ed212cd78b94ea4a8949778e1dc60b4eb73ce677..81d84842c48c4aba3e62d7cb977bb6744f0f2941 100644
--- a/ash/common/metrics/pointer_metrics_recorder_unittest.cc
+++ b/ash/common/metrics/pointer_metrics_recorder_unittest.cc
@@ -5,10 +5,10 @@
 #include "ash/common/metrics/pointer_metrics_recorder.h"
 
 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
-#include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/shared/app_types.h"
+#include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "base/test/histogram_tester.h"
 #include "ui/events/event.h"
@@ -135,14 +135,14 @@ TEST_F(PointerMetricsRecorderTest, DownEventPerFormFactor) {
       base::TimeTicks());
 
   // Enable maximize mode
-  WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
+  Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       true);
   pointer_metrics_recorder_->OnPointerEventObserved(pointer_event, gfx::Point(),
                                                     target.get());
   histogram_tester_->ExpectBucketCount(kFormFactorHistogramName, 1, 1);
 
   // Disable maximize mode
-  WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
+  Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       false);
   pointer_metrics_recorder_->OnPointerEventObserved(pointer_event, gfx::Point(),
                                                     target.get());