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

ash/test/ash_test.cc

 // Copyright 2016 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/ash_test.h"
 
+#include "ash/common/wm_shell.h"
+#include "ash/common/wm_window.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/wm_shelf.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/test/ash_test_impl.h"
 #include "ash/test/test_session_state_delegate.h"
 #include "ash/test/test_system_tray_delegate.h"
-#include "ash/wm_shell.h"
-#include "ash/wm_window.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "ui/compositor/layer_type.h"
 #include "ui/display/display.h"
 
 namespace ash {
 
 WindowOwner::WindowOwner(WmWindow* window) : window_(window) {}
 
 WindowOwner::~WindowOwner() {
@@ skipping 109 matching lines @@
 
 void AshTest::SetUp() {
   test_impl_->SetUp();
 }
 
 void AshTest::TearDown() {
   test_impl_->TearDown();
 }
 
 }  // namespace ash