Refactor and push window properties up to class properties.

ui/aura/window_unittest.cc

Index: ui/aura/window_unittest.cc
diff --git a/ui/aura/window_unittest.cc b/ui/aura/window_unittest.cc
index 6d5cf838e1a2164241423811d4c476b365a7493c..5ece0b4869852a2edfeb73fbff3ed6693e5a3ca7 100644
--- a/ui/aura/window_unittest.cc
+++ b/ui/aura/window_unittest.cc
@@ -30,8 +30,8 @@
 #include "ui/aura/window_delegate.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_observer.h"
-#include "ui/aura/window_property.h"
 #include "ui/aura/window_tree_host.h"
+#include "ui/base/class_property.h"
 #include "ui/base/hit_test.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animation_observer.h"
@@ -48,7 +48,7 @@
 #include "ui/gfx/geometry/vector2d.h"
 #include "ui/gfx/skia_util.h"
 
-DECLARE_WINDOW_PROPERTY_TYPE(const char*)
+DECLARE_UI_CLASS_PROPERTY_TYPE(const char*)
 
 namespace {
 
@@ -113,16 +113,16 @@ class TestProperty {
 
 TestProperty* TestProperty::last_deleted_ = nullptr;
 
-DEFINE_OWNED_WINDOW_PROPERTY_KEY(TestProperty, kOwnedKey, NULL);
-DEFINE_OWNED_WINDOW_PROPERTY_KEY(DeletionTestProperty,
-                                 kDeletionTestPropertyKey,
-                                 nullptr);
+DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(TestProperty, kOwnedKey, NULL);
+DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(DeletionTestProperty,
+                                kDeletionTestPropertyKey,
+                                nullptr);
 
 }  // namespace
 
-DECLARE_WINDOW_PROPERTY_TYPE(TestProperty*);
+DECLARE_UI_CLASS_PROPERTY_TYPE(TestProperty*);
 
-DECLARE_WINDOW_PROPERTY_TYPE(DeletionTestProperty*);
+DECLARE_UI_CLASS_PROPERTY_TYPE(DeletionTestProperty*);
 
 namespace aura {
 namespace test {
@@ -1656,8 +1656,8 @@ TEST_P(WindowTest, TransformGesture) {
 }
 
 namespace {
-DEFINE_WINDOW_PROPERTY_KEY(int, kIntKey, -2);
-DEFINE_WINDOW_PROPERTY_KEY(const char*, kStringKey, "squeamish");
+DEFINE_UI_CLASS_PROPERTY_KEY(int, kIntKey, -2);
+DEFINE_UI_CLASS_PROPERTY_KEY(const char*, kStringKey, "squeamish");
 }
 
 TEST_P(WindowTest, Property) {