chromeos: Renames WmWindowAura to WmWindow

ash/test/wm_window_test_api.h

Index: ash/test/wm_window_test_api.h
diff --git a/ash/test/wm_window_aura_test_api.h b/ash/test/wm_window_test_api.h
similarity index 60%
rename from ash/test/wm_window_aura_test_api.h
rename to ash/test/wm_window_test_api.h
index 9b21624939df8ca5620365a85eb848cb07fd3bfc..33bd1a18a5f633afd0a0ae225c3fe5b50fd3617f 100644
--- a/ash/test/wm_window_aura_test_api.h
+++ b/ash/test/wm_window_test_api.h
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_TEST_WM_WINDOW_AURA_TEST_API_H_
-#define ASH_TEST_WM_WINDOW_AURA_TEST_API_H_
+#ifndef ASH_TEST_WM_WINDOW_TEST_API_H_
+#define ASH_TEST_WM_WINDOW_TEST_API_H_
 
-#include "ash/aura/wm_window_aura.h"
+#include "ash/common/wm_window.h"
 
 namespace ash {
 
-class WmWindowAuraTestApi {
+class WmWindowTestApi {
  public:
   // Used by tests to set the default value of
-  // |WmWindowAura::default_use_empty_minimum_size_for_testing_|. This is needed
+  // |WmWindow::default_use_empty_minimum_size_for_testing_|. This is needed
   // as tests don't have a good way to reset the value of
   // |use_empty_minimum_size_for_testing_| before the minimum size is queried.
   class GlobalMinimumSizeLock {
@@ -27,10 +27,8 @@ class WmWindowAuraTestApi {
     DISALLOW_COPY_AND_ASSIGN(GlobalMinimumSizeLock);
   };
 
-  explicit WmWindowAuraTestApi(WmWindow* window)
-      : WmWindowAuraTestApi(static_cast<WmWindowAura*>(window)) {}
-  explicit WmWindowAuraTestApi(WmWindowAura* window) : window_(window) {}
-  ~WmWindowAuraTestApi() {}
+  explicit WmWindowTestApi(WmWindow* window) : window_(window) {}
+  ~WmWindowTestApi() {}
 
   void set_use_empty_minimum_size(bool value) {
     window_->use_empty_minimum_size_for_testing_ = true;
@@ -39,11 +37,11 @@ class WmWindowAuraTestApi {
  private:
   static void SetDefaultUseEmptyMinimumSizeForTesting(bool value);
 
-  WmWindowAura* window_;
+  WmWindow* window_;
 
-  DISALLOW_COPY_AND_ASSIGN(WmWindowAuraTestApi);
+  DISALLOW_COPY_AND_ASSIGN(WmWindowTestApi);
 };
 
 }  // namespace ash
 
-#endif  // ASH_TEST_WM_WINDOW_AURA_TEST_API_H_
+#endif  // ASH_TEST_WM_WINDOW_TEST_API_H_