Refactor and push window properties up to class properties.

ui/aura/mus/property_converter.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/aura/mus/property_converter.h"
 
 #include "base/memory/ptr_util.h"
 #include "mojo/public/cpp/bindings/type_converter.h"
 #include "services/ui/public/cpp/property_type_converters.h"
 #include "services/ui/public/interfaces/window_manager.mojom.h"
 #include "ui/aura/client/aura_constants.h"
-#include "ui/aura/window_property.h"
+#include "ui/base/class_property.h"
 
 namespace aura {
 
 namespace {
 
 // Get the WindowProperty's value as a byte array. Only supports aura properties
 // that point to types with a matching std::vector<uint8_t> mojo::TypeConverter.
 template <typename T>
 std::unique_ptr<std::vector<uint8_t>> GetArray(Window* window,
                                                const WindowProperty<T>* key) {
@@ skipping 233 matching lines @@
   string_properties_[property] = transport_name;
 }
 
 void PropertyConverter::RegisterProperty(
     const WindowProperty<base::string16*>* property,
     const char* transport_name) {
   string16_properties_[property] = transport_name;
 }
 
 }  // namespace aura