Revert of mash: Fix MusPropertyMirrorAsh for owned properties; add test.

ash/wm/window_properties.cc

Index: ash/wm/window_properties.cc
diff --git a/ash/wm/window_properties.cc b/ash/wm/window_properties.cc
index f6f8e41a2ad3f7defca19fec758d6ddb28063971..1364c089f65e4c7b6646f35aa8fc3e19c851acde 100644
--- a/ash/wm/window_properties.cc
+++ b/ash/wm/window_properties.cc
@@ -5,6 +5,7 @@
 #include "ash/wm/window_properties.h"
 
 #include "ash/common/wm/window_state.h"
+#include "ui/base/class_property.h"
 
 DECLARE_UI_CLASS_PROPERTY_TYPE(ash::wm::WindowState*);
 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(ASH_EXPORT, ash::WidgetCreationType);
@@ -13,6 +14,8 @@
 
 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kLockedToRootKey, false);
 
+DEFINE_UI_CLASS_PROPERTY_KEY(bool, kPanelAttachedKey, true);
+
 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::Rect, kRestoreBoundsOverrideKey, NULL);
 
 DEFINE_UI_CLASS_PROPERTY_KEY(ui::WindowShowState,
@@ -20,6 +23,8 @@
                              ui::SHOW_STATE_DEFAULT);
 
 DEFINE_UI_CLASS_PROPERTY_KEY(ShelfID, kShelfIDKey, kInvalidShelfID);
+
+DEFINE_UI_CLASS_PROPERTY_KEY(int32_t, kShelfItemTypeKey, TYPE_UNDEFINED);
 
 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kSnapChildrenToPixelBoundary, false);