Refactor and push window properties up to class properties.

ash/mus/move_event_handler.cc

Index: ash/mus/move_event_handler.cc
diff --git a/ash/mus/move_event_handler.cc b/ash/mus/move_event_handler.cc
index 6a4c17349c9008fddb93dc2b314ca59e37b88db5..87a1eee8ff3b3ff6917d9e2862ae4ee5e96481ca 100644
--- a/ash/mus/move_event_handler.cc
+++ b/ash/mus/move_event_handler.cc
@@ -9,18 +9,18 @@
 #include "services/ui/public/interfaces/cursor.mojom.h"
 #include "ui/aura/mus/window_manager_delegate.h"
 #include "ui/aura/window.h"
-#include "ui/aura/window_property.h"
+#include "ui/base/class_property.h"
 #include "ui/base/hit_test.h"
 #include "ui/events/event.h"
 
-DECLARE_WINDOW_PROPERTY_TYPE(ash::mus::MoveEventHandler*);
+DECLARE_CLASS_PROPERTY_TYPE(ash::mus::MoveEventHandler*);
 
 namespace {
 
 // Key used for storing identifier sent to clients for windows.
-DEFINE_WINDOW_PROPERTY_KEY(ash::mus::MoveEventHandler*,
-                           kWmMoveEventHandler,
-                           nullptr);
+DEFINE_CLASS_PROPERTY_KEY(ash::mus::MoveEventHandler*,
+                          kWmMoveEventHandler,
+                          nullptr);
 
 }  // namespace