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

ash/mus/top_level_window_factory_unittest.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/mus/top_level_window_factory.h"
 
 #include <stdint.h>
 
 #include <map>
 #include <string>
 #include <vector>
 
+#include "ash/common/wm_shell.h"
+#include "ash/common/wm_window.h"
 #include "ash/mus/test/wm_test_base.h"
 #include "ash/mus/window_manager.h"
 #include "ash/mus/window_manager_application.h"
 #include "ash/test/ash_test.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/ash_test_helper.h"
-#include "ash/wm_shell.h"
-#include "ash/wm_window.h"
 #include "ui/aura/window.h"
 #include "ui/display/screen.h"
 
 namespace ash {
 
 namespace {
 
 int64_t GetDisplayId(aura::Window* window) {
   return display::Screen::GetScreen()->GetDisplayNearestWindow(window).id();
 }
@@ skipping 32 matching lines @@
 TEST_F(TopLevelWindowFactoryAshTest, TopLevelNotShownOnCreate) {
   std::map<std::string, std::vector<uint8_t>> properties;
   std::unique_ptr<aura::Window> window(mus::CreateAndParentTopLevelWindow(
       ash_test_helper()->window_manager_app()->window_manager(),
       ui::mojom::WindowType::WINDOW, &properties));
   ASSERT_TRUE(window);
   EXPECT_FALSE(window->IsVisible());
 }
 
 }  // namespace ash