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

ash/wm/screen_pinning_controller_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/wm/screen_pinning_controller.h"
 
 #include <vector>
 
 #include "ash/accelerators/accelerator_controller.h"
+#include "ash/common/wm_shell.h"
+#include "ash/common/wm_window.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/wm_event.h"
-#include "ash/wm_shell.h"
-#include "ash/wm_window.h"
 #include "base/stl_util.h"
 #include "ui/aura/window.h"
 
 namespace ash {
 namespace {
 
 int FindIndex(const std::vector<aura::Window*>& windows,
               const aura::Window* target) {
   auto iter = std::find(windows.begin(), windows.end(), target);
   return iter != windows.end() ? iter - windows.begin() : -1;
@@ skipping 133 matching lines @@
   wm::PinWindow(w1, /* trusted */ true);
   EXPECT_TRUE(WmShell::Get()->IsPinned());
 
   WmShell::Get()->accelerator_controller()->PerformActionIfEnabled(UNPIN);
   // The UNPIN accelerator key is disabled for trusted pinned and the window
   // must be still pinned.
   EXPECT_TRUE(WmShell::Get()->IsPinned());
 }
 
 }  // namespace ash