Refactor and push window properties up to class properties.

ui/wm/public/animation_host.cc

Index: ui/wm/public/animation_host.cc
diff --git a/ui/wm/public/animation_host.cc b/ui/wm/public/animation_host.cc
index 0d90f9c6a6bda16643e555885095cf5edbae0164..c9b3b260f1cbdae8b2dfb6d5f3d793034432d1d3 100644
--- a/ui/wm/public/animation_host.cc
+++ b/ui/wm/public/animation_host.cc
@@ -5,14 +5,14 @@
 #include "ui/wm/public/animation_host.h"
 
 #include "ui/aura/window.h"
-#include "ui/aura/window_property.h"
+#include "ui/base/class_property.h"
 
-DECLARE_WINDOW_PROPERTY_TYPE(aura::client::AnimationHost*)
+DECLARE_UI_CLASS_PROPERTY_TYPE(aura::client::AnimationHost*)
 
 namespace aura {
 namespace client {
 
-DEFINE_WINDOW_PROPERTY_KEY(AnimationHost*, kRootWindowAnimationHostKey, NULL);
+DEFINE_UI_CLASS_PROPERTY_KEY(AnimationHost*, kRootWindowAnimationHostKey, NULL);
 
 void SetAnimationHost(Window* window, AnimationHost* animation_host) {
   DCHECK(window);