[mus+ash] Removes WmWindow from ash/wm/overview and ash/wm/workspace

ash/wm/overview/cleanup_animation_observer_unittest.cc

 // Copyright 2016 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/wm/overview/cleanup_animation_observer.h"
 
 #include <vector>
 
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/overview/window_selector_delegate.h"
-#include "ash/wm_window.h"
+#include "ui/aura/window.h"
 #include "ui/compositor/layer_animation_observer.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_observer.h"
 
 namespace ash {
 namespace {
 
@@ skipping 95 matching lines @@
   delegate.AddDelayedAnimationObserver(std::move(observer));
 }
 
 // Tests that completing animation deletes the animation observer and the
 // test widget and that deleting the WindowSelectorDelegate instance which
 // owns the observer does not crash.
 TEST_F(CleanupAnimationObserverTest, CreateAnimateComplete) {
   TestWindowSelectorDelegate delegate;
   std::unique_ptr<views::Widget> widget(
       CreateWindowWidget(gfx::Rect(0, 0, 40, 40)));
-  WmWindow* widget_window = WmWindow::Get(widget->GetNativeWindow());
+  aura::Window* widget_window = widget->GetNativeWindow();
   {
     ui::ScopedLayerAnimationSettings animation_settings(
-        widget_window->GetLayer()->GetAnimator());
+        widget_window->layer()->GetAnimator());
     animation_settings.SetTransitionDuration(
         base::TimeDelta::FromMilliseconds(1000));
     animation_settings.SetPreemptionStrategy(
         ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
 
     std::unique_ptr<CleanupAnimationObserver> observer(
         new CleanupAnimationObserver(std::move(widget)));
     animation_settings.AddObserver(observer.get());
     delegate.AddDelayedAnimationObserver(std::move(observer));
 
     widget_window->SetBounds(gfx::Rect(50, 50, 60, 60));
   }
   // The widget should be destroyed when |animation_settings| gets out of scope
   // which in absence of NON_ZERO_DURATION animation duration mode completes
   // the animation and calls OnImplicitAnimationsCompleted() on the cleanup
   // observer and auto-deletes the owned widget.
   EXPECT_TRUE(widget_destroyed());
   // TestWindowSelectorDelegate going out of scope should not crash.
 }
 
 // Tests that starting an animation and exiting doesn't crash. If not for
 // TestWindowSelectorDelegate calling Shutdown() on a CleanupAnimationObserver
 // instance in destructor, this test would have crashed.
 TEST_F(CleanupAnimationObserverTest, CreateAnimateShutdown) {
   TestWindowSelectorDelegate delegate;
   std::unique_ptr<views::Widget> widget(
       CreateWindowWidget(gfx::Rect(0, 0, 40, 40)));
-  WmWindow* widget_window = WmWindow::Get(widget->GetNativeWindow());
+  aura::Window* widget_window = widget->GetNativeWindow();
   {
     // Normal animations for tests have ZERO_DURATION, make sure we are actually
     // animating the movement.
     ui::ScopedAnimationDurationScaleMode animation_scale_mode(
         ui::ScopedAnimationDurationScaleMode::NON_ZERO_DURATION);
     ui::ScopedLayerAnimationSettings animation_settings(
-        widget_window->GetLayer()->GetAnimator());
+        widget_window->layer()->GetAnimator());
     animation_settings.SetTransitionDuration(
         base::TimeDelta::FromMilliseconds(1000));
     animation_settings.SetPreemptionStrategy(
         ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
 
     std::unique_ptr<CleanupAnimationObserver> observer(
         new CleanupAnimationObserver(std::move(widget)));
     animation_settings.AddObserver(observer.get());
     delegate.AddDelayedAnimationObserver(std::move(observer));
 
     widget_window->SetBounds(gfx::Rect(50, 50, 60, 60));
   }
   // The widget still exists.
   EXPECT_FALSE(widget_destroyed());
   // The test widget is auto-deleted when |delegate| that owns it goes out of
   // scope. The animation is still active when this happens which should not
   // crash.
 }
 
 }  // namespace ash