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

ash/test/test_system_tray_delegate.cc

 // Copyright 2013 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/test_system_tray_delegate.h"
 
 #include <string>
 
-#include "ash/login_status.h"
-#include "ash/session/session_state_delegate.h"
-#include "ash/wm_shell.h"
+#include "ash/common/login_status.h"
+#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/wm_shell.h"
 #include "base/time/time.h"
 
 namespace ash {
 namespace test {
 
 namespace {
 
 LoginStatus g_initial_status = LoginStatus::USER;
 
 }  // namespace
@@ skipping 78 matching lines @@
     : old_status_(g_initial_status) {
   g_initial_status = new_status;
 }
 
 ScopedInitialLoginStatus::~ScopedInitialLoginStatus() {
   g_initial_status = old_status_;
 }
 
 }  // namespace test
 }  // namespace ash