Refactor and push window properties up to class properties.

ui/wm/public/window_move_client.cc

Index: ui/wm/public/window_move_client.cc
diff --git a/ui/wm/public/window_move_client.cc b/ui/wm/public/window_move_client.cc
index 44ccca965c64facbbd4328e88a2727148d8ec104..cb9188865cbb923765dc20bbda6718794e57720b 100644
--- a/ui/wm/public/window_move_client.cc
+++ b/ui/wm/public/window_move_client.cc
@@ -5,15 +5,15 @@
 #include "ui/wm/public/window_move_client.h"
 
 #include "ui/aura/window.h"
-#include "ui/aura/window_property.h"
+#include "ui/base/class_property.h"
 
-DECLARE_WINDOW_PROPERTY_TYPE(aura::client::WindowMoveClient*)
+DECLARE_UI_CLASS_PROPERTY_TYPE(aura::client::WindowMoveClient*)
 
 namespace aura {
 namespace client {
 
 // A property key to store a client that handles window moves.
-DEFINE_LOCAL_WINDOW_PROPERTY_KEY(
+DEFINE_LOCAL_UI_CLASS_PROPERTY_KEY(
     WindowMoveClient*, kWindowMoveClientKey, NULL);
 
 void SetWindowMoveClient(Window* window, WindowMoveClient* client) {