chromeos: Move files in //ash/common to //ash, part 2

ash/system/user/tray_user_unittest.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 <vector>
 
-#include "ash/common/shell_delegate.h"
-#include "ash/common/test/test_session_state_delegate.h"
-#include "ash/common/wm_shell.h"
+#include "ash/shell_delegate.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/user/tray_user.h"
 #include "ash/system/user/user_view.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/ash_test_helper.h"
+#include "ash/test/test_session_state_delegate.h"
 #include "ash/test/test_shell_delegate.h"
+#include "ash/wm_shell.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/signin/core/account_id/account_id.h"
 #include "components/user_manager/user_info.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/gfx/animation/animation_container_element.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
@@ skipping 218 matching lines @@
   const user_manager::UserInfo* second_user = delegate()->GetUserInfo(1);
   EXPECT_EQ(active_user->GetAccountId(), second_user->GetAccountId());
   // Since the name is capitalized, the email should be different than the
   // user_id.
   EXPECT_NE(active_user->GetAccountId().GetUserEmail(),
             second_user->GetDisplayEmail());
   tray()->CloseSystemBubble();
 }
 
 }  // namespace ash