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

ash/sticky_keys/sticky_keys_overlay_unittest.cc

 // Copyright 2014 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/sticky_keys/sticky_keys_overlay.h"
 
+#include "ash/common/wm_shell.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/shell.h"
 #include "ash/sticky_keys/sticky_keys_controller.h"
 #include "ash/test/ash_test_base.h"
-#include "ash/wm_shell.h"
 #include "ui/display/display_layout.h"
 #include "ui/display/manager/display_manager.h"
 #include "ui/display/test/display_manager_test_api.h"
 #include "ui/events/event.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 
 using StickyKeysOverlayTest = test::AshTestBase;
 
@@ skipping 63 matching lines @@
             overlay.GetModifierKeyState(ui::EF_SHIFT_DOWN));
   overlay.SetModifierKeyState(ui::EF_SHIFT_DOWN, STICKY_KEY_STATE_DISABLED);
   EXPECT_EQ(STICKY_KEY_STATE_DISABLED,
             overlay.GetModifierKeyState(ui::EF_SHIFT_DOWN));
 }
 
 // Additional sticky key overlay tests that depend on chromeos::EventRewriter
 // are now in chrome/browser/chromeos/events/event_rewriter_unittest.cc .
 
 }  // namespace ash