chromeos: Renames WmWindowAura to WmWindow

ash/metrics/user_metrics_recorder_unittest.cc

Index: ash/metrics/user_metrics_recorder_unittest.cc
diff --git a/ash/metrics/user_metrics_recorder_unittest.cc b/ash/metrics/user_metrics_recorder_unittest.cc
index ad120a2060974daf45499056a5aaddc15d4d16e2..c805d75174a3062f45030e147d6712494e612f19 100644
--- a/ash/metrics/user_metrics_recorder_unittest.cc
+++ b/ash/metrics/user_metrics_recorder_unittest.cc
@@ -6,12 +6,12 @@
 
 #include <memory>
 
-#include "ash/aura/wm_window_aura.h"
 #include "ash/common/login_status.h"
 #include "ash/common/shelf/shelf_model.h"
 #include "ash/common/test/test_shelf_delegate.h"
 #include "ash/common/test/test_system_tray_delegate.h"
 #include "ash/common/wm_shell.h"
+#include "ash/common/wm_window.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/user_metrics_recorder_test_api.h"
 #include "base/test/histogram_tester.h"
@@ -197,24 +197,24 @@ TEST_F(UserMetricsRecorderTest, ValuesRecordedByRecordShelfItemCounts) {
   ASSERT_EQ(TYPE_APP_LIST, shelf_items[0].type);
 
   aura::Window* pinned_window_with_app_id_1 = CreateTestWindow();
-  test_shelf_delegate->AddShelfItem(
-      WmWindowAura::Get(pinned_window_with_app_id_1), "app_id_1");
+  test_shelf_delegate->AddShelfItem(WmWindow::Get(pinned_window_with_app_id_1),
+                                    "app_id_1");
   test_shelf_delegate->PinAppWithID("app_id_1");
 
   aura::Window* pinned_window_with_app_id_2 = CreateTestWindow();
-  test_shelf_delegate->AddShelfItem(
-      WmWindowAura::Get(pinned_window_with_app_id_2), "app_id_2");
+  test_shelf_delegate->AddShelfItem(WmWindow::Get(pinned_window_with_app_id_2),
+                                    "app_id_2");
   test_shelf_delegate->PinAppWithID("app_id_2");
 
   aura::Window* unpinned_window_with_app_id_3 = CreateTestWindow();
   test_shelf_delegate->AddShelfItem(
-      WmWindowAura::Get(unpinned_window_with_app_id_3), "app_id_3");
+      WmWindow::Get(unpinned_window_with_app_id_3), "app_id_3");
 
   aura::Window* unpinned_window_4 = CreateTestWindow();
-  test_shelf_delegate->AddShelfItem(WmWindowAura::Get(unpinned_window_4));
+  test_shelf_delegate->AddShelfItem(WmWindow::Get(unpinned_window_4));
 
   aura::Window* unpinned_window_5 = CreateTestWindow();
-  test_shelf_delegate->AddShelfItem(WmWindowAura::Get(unpinned_window_5));
+  test_shelf_delegate->AddShelfItem(WmWindow::Get(unpinned_window_5));
 
   user_metrics_recorder_test_api()->RecordPeriodicMetrics();
   histograms().ExpectBucketCount(kAsh_Shelf_NumberOfItems, 5, 1);