Move some more WM functionality down into ash.

ash/wm/property_util.h

 // Copyright (c) 2011 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.
 
-#ifndef UI_AURA_SHELL_PROPERTY_UTIL_H_
-#define UI_AURA_SHELL_PROPERTY_UTIL_H_
+#ifndef ASH_WM_PROPERTY_UTIL_H_
+#define ASH_WM_PROPERTY_UTIL_H_
 #pragma once
 
 namespace aura {
 class Window;
 }
 
 namespace gfx {
 class Rect;
 }
 
@@ skipping 10 matching lines @@
 // Returns the restore bounds property on |window|. NULL if the
 // restore bounds property does not exist for |window|. |window|
 // owns the bounds object.
 const gfx::Rect* GetRestoreBounds(aura::Window* window);
 
 // Deletes and clears the restore bounds property on |window|.
 void ClearRestoreBounds(aura::Window* window);
 
 }
 
-#endif  // UI_AURA_SHELL_PROPERTY_UTIL_H_
+#endif  // ASH_WM_PROPERTY_UTIL_H_