[mus+ash] Removes WmWindow from ash (app_list, frame, metrics, session, system, wallpaper)

ash/metrics/pointer_metrics_recorder_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/metrics/pointer_metrics_recorder.h"
 
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/shared/app_types.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
-#include "ash/wm_window.h"
 #include "base/test/histogram_tester.h"
+#include "ui/aura/client/aura_constants.h"
+#include "ui/aura/window.h"
 #include "ui/events/event.h"
 #include "ui/views/pointer_watcher.h"
 #include "ui/views/widget/widget.h"
 
 using views::PointerWatcher;
 
 namespace ash {
 namespace {
 
 const char kFormFactorHistogramName[] = "Event.DownEventCount.PerFormFactor";
@@ skipping 127 matching lines @@
 
 // Verifies that down events dispatched to different destinations are recorded.
 TEST_F(PointerMetricsRecorderTest, DownEventPerDestination) {
   std::unique_ptr<views::Widget> target =
       CreateTestWidget(nullptr, kShellWindowId_DefaultContainer, gfx::Rect());
   const ui::PointerEvent pointer_event(
       ui::ET_POINTER_DOWN, gfx::Point(), gfx::Point(), 0, 0,
       ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE, 0),
       base::TimeTicks());
 
-  WmWindow* window = WmWindow::Get(target->GetNativeWindow());
+  aura::Window* window = target->GetNativeWindow();
   CHECK(window);
 
-  window->SetAppType(static_cast<int>(AppType::OTHERS));
+  window->SetProperty(aura::client::kAppType,
+                      static_cast<int>(AppType::OTHERS));
   pointer_metrics_recorder_->OnPointerEventObserved(pointer_event, gfx::Point(),
                                                     target.get());
   histogram_tester_->ExpectBucketCount(kDestinationHistogramName, 0, 1);
 
-  window->SetAppType(static_cast<int>(AppType::BROWSER));
+  window->SetProperty(aura::client::kAppType,
+                      static_cast<int>(AppType::BROWSER));
   pointer_metrics_recorder_->OnPointerEventObserved(pointer_event, gfx::Point(),
                                                     target.get());
   histogram_tester_->ExpectBucketCount(kDestinationHistogramName, 1, 1);
 
-  window->SetAppType(static_cast<int>(AppType::CHROME_APP));
+  window->SetProperty(aura::client::kAppType,
+                      static_cast<int>(AppType::CHROME_APP));
   pointer_metrics_recorder_->OnPointerEventObserved(pointer_event, gfx::Point(),
                                                     target.get());
   histogram_tester_->ExpectBucketCount(kDestinationHistogramName, 2, 1);
 
-  window->SetAppType(static_cast<int>(AppType::ARC_APP));
+  window->SetProperty(aura::client::kAppType,
+                      static_cast<int>(AppType::ARC_APP));
   pointer_metrics_recorder_->OnPointerEventObserved(pointer_event, gfx::Point(),
                                                     target.get());
   histogram_tester_->ExpectBucketCount(kDestinationHistogramName, 3, 1);
 }
 
 }  // namespace ash