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

ash/test/test_shelf_delegate.cc

 // Copyright 2013 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.
 
 #include "ash/test/test_shelf_delegate.h"
 
 #include <utility>
 
+#include "ash/common/shell_observer.h"
+#include "ash/common/wm_shell.h"
+#include "ash/common/wm_window.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_model.h"
 #include "ash/shelf/wm_shelf.h"
-#include "ash/shell_observer.h"
 #include "ash/test/test_shelf_item_delegate.h"
 #include "ash/wm/window_properties.h"
-#include "ash/wm_shell.h"
-#include "ash/wm_window.h"
 #include "base/memory/ptr_util.h"
 #include "ui/aura/window.h"
 
 namespace ash {
 namespace test {
 
 TestShelfDelegate* TestShelfDelegate::instance_ = nullptr;
 
 // A ShellObserver that sets the shelf alignment and auto hide behavior when the
 // shelf is created, to simulate ChromeLauncherController's behavior.
@@ skipping 126 matching lines @@
                                                  const std::string& app_id) {
   shelf_id_to_app_id_map_[shelf_id] = app_id;
 }
 
 void TestShelfDelegate::RemoveShelfIDToAppIDMapping(ShelfID shelf_id) {
   shelf_id_to_app_id_map_.erase(shelf_id);
 }
 
 }  // namespace test
 }  // namespace ash