Moves ash/wm/common back into ash

ash/wm/common/container_finder.h

Index: ash/wm/common/container_finder.h
diff --git a/ash/wm/common/container_finder.h b/ash/wm/common/container_finder.h
index df6be4cd00cd5cfc7a3532ba55b3807e7675c789..48ec3445e3e46b7a558e6045c2bd109aaeeba64c 100644
--- a/ash/wm/common/container_finder.h
+++ b/ash/wm/common/container_finder.h
@@ -5,7 +5,7 @@
 #ifndef ASH_WM_COMMON_CONTAINER_FINDER_H_
 #define ASH_WM_COMMON_CONTAINER_FINDER_H_
 
-#include "ash/wm/common/ash_wm_common_export.h"
+#include "ash/ash_export.h"
 
 namespace gfx {
 class Rect;
@@ -17,14 +17,14 @@ namespace wm {
 class WmWindow;
 
 // Returns the first ancestor of |window| that has a known type.
-ASH_WM_COMMON_EXPORT WmWindow* GetContainerForWindow(WmWindow* window);
+ASH_EXPORT WmWindow* GetContainerForWindow(WmWindow* window);
 
 // Returns the parent to add |window| to in |context|. This is generally
 // used when a window is moved from one root to another. In this case |context|
 // is the new root to add |window| to.
-ASH_WM_COMMON_EXPORT WmWindow* GetDefaultParent(WmWindow* context,
-                                                WmWindow* window,
-                                                const gfx::Rect& bounds);
+ASH_EXPORT WmWindow* GetDefaultParent(WmWindow* context,
+                                      WmWindow* window,
+                                      const gfx::Rect& bounds);
 
 }  // namespace wm
 }  // namespace ash