Renames WmWindowUserData and converts to using aura

ash/wm/screen_dimmer_unittest.cc

 // Copyright (c) 2012 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 "ash/common/wm/screen_dimmer.h"
 
 #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"
 #include "base/memory/ptr_util.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/compositor/layer.h"
 
 namespace ash {
 namespace test {
 
 class ScreenDimmerTest : public AshTestBase {
  public:
   ScreenDimmerTest() {}
   ~ScreenDimmerTest() override {}
 
   void SetUp() override {
     AshTestBase::SetUp();
     dimmer_ = base::MakeUnique<ScreenDimmer>(ScreenDimmer::Container::ROOT);
   }
 
   void TearDown() override {
     dimmer_.reset();
     AshTestBase::TearDown();
   }
 
   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() {
     aura::Window* window = GetDimWindow();
     return window ? window->layer() : nullptr;
   }
 
  protected:
   std::unique_ptr<ScreenDimmer> dimmer_;
 
@@ skipping 72 matching lines @@
     AshTestBase::TearDown();
     // ScreenDimmer is destroyed *after* the shell.
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ScreenDimmerShellDestructionTest);
 };
 
 // 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) {
 }
 
 }  // namespace test
 }  // namespace ash