Revert "chromeos: Move files in //ash/common to //ash, part 1"

ash/common/system/status_area_layout_manager.h

 // Copyright (c) 2012 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 ASH_SYSTEM_STATUS_AREA_LAYOUT_MANAGER_H_
-#define ASH_SYSTEM_STATUS_AREA_LAYOUT_MANAGER_H_
+#ifndef ASH_COMMON_SYSTEM_STATUS_AREA_LAYOUT_MANAGER_H_
+#define ASH_COMMON_SYSTEM_STATUS_AREA_LAYOUT_MANAGER_H_
 
 #include "ash/common/wm/wm_snap_to_pixel_layout_manager.h"
 #include "base/macros.h"
 
 namespace ash {
 
 class ShelfWidget;
 
 // StatusAreaLayoutManager is a layout manager responsible for the status area.
 // In any case when status area needs relayout it redirects this call to
@@ skipping 17 matching lines @@
   // Used to prevent calling itself again from SetChildBounds().
   bool in_layout_;
 
   ShelfWidget* shelf_widget_;
 
   DISALLOW_COPY_AND_ASSIGN(StatusAreaLayoutManager);
 };
 
 }  // namespace ash
 
-#endif  // ASH_SYSTEM_STATUS_AREA_LAYOUT_MANAGER_H_
+#endif  // ASH_COMMON_SYSTEM_STATUS_AREA_LAYOUT_MANAGER_H_