Use unique name for property deallocator.

ui/aura/window_property.h

Index: ui/aura/window_property.h
diff --git a/ui/aura/window_property.h b/ui/aura/window_property.h
index 796aa08d6addc4931a8a9255dc4f1ab6aa64c229..118df4c73d075a285dca5fb8559cfede1653336c 100644
--- a/ui/aura/window_property.h
+++ b/ui/aura/window_property.h
@@ -129,14 +129,14 @@ void Window::ClearProperty(const WindowProperty<T>* property) {
   }
 
 #define DEFINE_OWNED_WINDOW_PROPERTY_KEY(TYPE, NAME, DEFAULT) \
-  namespace {                                             \
-    enum { type_must_be_complete = sizeof(TYPE) };        \
-    void Deallocator(intptr_t p) {                        \
+  namespace {                                                   \
+    void Deallocator ## NAME (intptr_t p) {                     \
+      enum { type_must_be_complete = sizeof(TYPE) };            \
       delete aura::WindowPropertyCaster<TYPE*>::FromIntptrT(p); \
-    }                                                     \
-    const aura::WindowProperty<TYPE*> NAME ## _Value =    \
-        {DEFAULT,#NAME,&Deallocator};                     \
-  }                                                       \
+    }                                                           \
+    const aura::WindowProperty<TYPE*> NAME ## _Value =          \
+        {DEFAULT,#NAME,&Deallocator ## NAME};                   \
+  }                                                             \
   const aura::WindowProperty<TYPE*>* const NAME = & NAME ## _Value;
 
 #endif  // UI_AURA_WINDOW_PROPERTY_H_