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

ash/shelf/shelf_locking_manager_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/shelf/shelf_locking_manager.h"
 
-#include "ash/session/session_state_delegate.h"
+#include "ash/common/session/session_state_delegate.h"
 #include "ash/shelf/wm_shelf.h"
 #include "ash/test/ash_test_base.h"
 
 namespace ash {
 namespace test {
 
 // Tests the shelf behavior when the screen or session is locked.
 class ShelfLockingManagerTest : public ash::test::AshTestBase {
  public:
   ShelfLockingManagerTest() {}
@@ skipping 55 matching lines @@
   SetScreenLocked(true);
   EXPECT_EQ(SHELF_ALIGNMENT_BOTTOM_LOCKED, shelf->GetAlignment());
   shelf->SetAlignment(SHELF_ALIGNMENT_RIGHT);
   EXPECT_EQ(SHELF_ALIGNMENT_BOTTOM_LOCKED, shelf->GetAlignment());
   SetScreenLocked(false);
   EXPECT_EQ(SHELF_ALIGNMENT_RIGHT, shelf->GetAlignment());
 }
 
 }  // namespace test
 }  // namespace ash