Renames WmWindowUserData and converts to using aura

ash/wm/screen_dimmer_unittest.cc

Index: ash/wm/screen_dimmer_unittest.cc
diff --git a/ash/wm/screen_dimmer_unittest.cc b/ash/wm/screen_dimmer_unittest.cc
index 709886f738be2e07edcb986af69f8b8416e570f8..df36a56256604414f59104ad681559b07a742835 100644
--- a/ash/wm/screen_dimmer_unittest.cc
+++ b/ash/wm/screen_dimmer_unittest.cc
@@ -6,10 +6,9 @@
 
 #include <memory>
 
+#include "ash/common/window_user_data.h"
 #include "ash/common/wm/window_dimmer.h"
-#include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
-#include "ash/common/wm_window_user_data.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
@@ -37,9 +36,8 @@ class ScreenDimmerTest : public AshTestBase {
 
   aura::Window* GetDimWindow() {
     WindowDimmer* window_dimmer =
-        dimmer_->window_dimmers_->Get(WmShell::Get()->GetPrimaryRootWindow());
-    return window_dimmer ? WmWindow::GetAuraWindow(window_dimmer->window())
-                         : nullptr;
+        dimmer_->window_dimmers_->Get(Shell::GetPrimaryRootWindow());
+    return window_dimmer ? window_dimmer->window() : nullptr;
   }
 
   ui::Layer* GetDimWindowLayer() {
@@ -132,7 +130,7 @@ class ScreenDimmerShellDestructionTest : public AshTestBase {
 
 // This test verifies ScreenDimmer can be destroyed after the shell. The
 // interesting part of this test is in TearDown(), which creates a ScreenDimmer
-// that is deleted after WmShell.
+// that is deleted after Shell.
 TEST_F(ScreenDimmerShellDestructionTest, DontCrashIfScreenDimmerOutlivesShell) {
 }