Refactor and push window properties up to class properties.

ash/mus/root_window_controller.cc

Index: ash/mus/root_window_controller.cc
diff --git a/ash/mus/root_window_controller.cc b/ash/mus/root_window_controller.cc
index 53f9a19b392f2a3506cf91a76bc9a59829ae026c..984856183a4dd6f9844435708beffdec4d1961bb 100644
--- a/ash/mus/root_window_controller.cc
+++ b/ash/mus/root_window_controller.cc
@@ -41,19 +41,19 @@
 #include "ui/aura/mus/window_tree_client.h"
 #include "ui/aura/mus/window_tree_host_mus.h"
 #include "ui/aura/window.h"
-#include "ui/aura/window_property.h"
+#include "ui/base/class_property.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/display/display_list.h"
 
-DECLARE_WINDOW_PROPERTY_TYPE(ash::mus::RootWindowController*);
+DECLARE_CLASS_PROPERTY_TYPE(ash::mus::RootWindowController*);
 
 namespace ash {
 namespace mus {
 namespace {
 
-DEFINE_LOCAL_WINDOW_PROPERTY_KEY(ash::mus::RootWindowController*,
-                                 kRootWindowControllerKey,
-                                 nullptr);
+DEFINE_LOCAL_CLASS_PROPERTY_KEY(ash::mus::RootWindowController*,
+                                kRootWindowControllerKey,
+                                nullptr);
 
 bool IsFullscreen(aura::PropertyConverter* property_converter,
                   const std::vector<uint8_t>& transport_data) {