Tray elements behave appropriately on the multiple signin screen (more like lock screen)

chrome/browser/chromeos/system/tray_accessibility_browsertest.cc

Index: chrome/browser/chromeos/system/tray_accessibility_browsertest.cc
diff --git a/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc b/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc
index 7da7af02c5e718aae79fab43d927bb3dadf9151a..efeb20e25a2903cdcdb0b7100c7e37dfbc4a6071 100644
--- a/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc
+++ b/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc
@@ -7,6 +7,8 @@
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray_accessibility.h"
 #include "ash/system/user/login_status.h"
+#include "ash/test/shell_test_api.h"
+#include "ash/test/test_session_state_delegate.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
@@ -237,6 +239,14 @@ class TrayAccessibilityTest
     return tray()->detailed_menu_->virtual_keyboard_view_;
   }
 
+  bool IsHelpShownOnDetailMenu() const {
+    return tray()->detailed_menu_->help_view_;
+  }
+
+  bool IsSettingsShownOnDetailMenu() const {
+    return tray()->detailed_menu_->settings_view_;
+  }
+
   bool IsNotificationShown() const {
     return (tray()->detailed_popup_ &&
             !tray()->detailed_popup_->GetWidget()->IsClosed());
@@ -851,6 +861,8 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, CheckMenuVisibilityOnDetailMenu) {
   EXPECT_TRUE(IsLargeCursorMenuShownOnDetailMenu());
   EXPECT_FALSE(IsAutoclickMenuShownOnDetailMenu());
   EXPECT_TRUE(IsVirtualKeyboardMenuShownOnDetailMenu());
+  EXPECT_FALSE(IsHelpShownOnDetailMenu());
+  EXPECT_FALSE(IsSettingsShownOnDetailMenu());
   CloseDetailMenu();
 
   SetLoginStatus(ash::user::LOGGED_IN_USER);
@@ -861,6 +873,8 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, CheckMenuVisibilityOnDetailMenu) {
   EXPECT_FALSE(IsLargeCursorMenuShownOnDetailMenu());
   EXPECT_TRUE(IsAutoclickMenuShownOnDetailMenu());
   EXPECT_TRUE(IsVirtualKeyboardMenuShownOnDetailMenu());
+  EXPECT_TRUE(IsHelpShownOnDetailMenu());
+  EXPECT_TRUE(IsSettingsShownOnDetailMenu());
   CloseDetailMenu();
 
   SetLoginStatus(ash::user::LOGGED_IN_LOCKED);
@@ -871,6 +885,25 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, CheckMenuVisibilityOnDetailMenu) {
   EXPECT_FALSE(IsLargeCursorMenuShownOnDetailMenu());
   EXPECT_TRUE(IsAutoclickMenuShownOnDetailMenu());
   EXPECT_TRUE(IsVirtualKeyboardMenuShownOnDetailMenu());
+  EXPECT_FALSE(IsHelpShownOnDetailMenu());
+  EXPECT_FALSE(IsSettingsShownOnDetailMenu());
+  CloseDetailMenu();
+
+  ash::test::TestSessionStateDelegate* session_state_delegate =
+      new ash::test::TestSessionStateDelegate;
+  ash::test::ShellTestApi test_api(ash::Shell::GetInstance());
+  test_api.SetSessionStateDelegate(session_state_delegate);
+  session_state_delegate->SetUserAddingScreenRunning(true);
+  SetLoginStatus(ash::user::LOGGED_IN_USER);
+  EXPECT_TRUE(CreateDetailedMenu());
+  EXPECT_TRUE(IsSpokenFeedbackMenuShownOnDetailMenu());
+  EXPECT_TRUE(IsHighContrastMenuShownOnDetailMenu());
+  EXPECT_TRUE(IsScreenMagnifierMenuShownOnDetailMenu());
+  EXPECT_FALSE(IsLargeCursorMenuShownOnDetailMenu());
+  EXPECT_TRUE(IsAutoclickMenuShownOnDetailMenu());
+  EXPECT_TRUE(IsVirtualKeyboardMenuShownOnDetailMenu());
+  EXPECT_FALSE(IsHelpShownOnDetailMenu());
+  EXPECT_FALSE(IsSettingsShownOnDetailMenu());
   CloseDetailMenu();
 }