ash: Merge LoginStatus update code path

chrome/browser/chromeos/system/tray_accessibility_browsertest.cc

 // Copyright (c) 2012 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/common/accessibility_types.h"
 #include "ash/common/login_status.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray_accessibility.h"
 #include "ash/magnifier/magnification_controller.h"
 #include "ash/shell.h"
 #include "ash/test/shell_test_api.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/extensions/api/braille_display_private/mock_braille_controller.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/ui/ash/session_controller_client.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chromeos/chromeos_switches.h"
 #include "components/policy/core/browser/browser_policy_connector.h"
 #include "components/policy/core/common/external_data_fetcher.h"
 #include "components/policy/core/common/mock_configuration_policy_provider.h"
 #include "components/policy/core/common/policy_map.h"
 #include "components/policy/core/common/policy_types.h"
@@ skipping 104 matching lines @@
   bool CanCreateMenuItem() {
     views::View* menu_item_view = CreateMenuItem();
     DestroyMenuItem();
     return menu_item_view != NULL;
   }
 
   void SetLoginStatus(ash::LoginStatus status) {
     tray()->UpdateAfterLoginStatusChange(status);
   }
 
-  ash::LoginStatus GetLoginStatus() { return tray()->login_; }
+  ash::LoginStatus GetLoginStatus() {
+    // Flush to ensure the session state reaches ash and updates login status.
+    SessionControllerClient::FlushForTesting();

[James Cook, 2017/04/05 00:16:24]

Can this be done just when the state is changed? It's a little weird that it's
flushed on every read.

[xiyuan, 2017/04/05 22:29:07]

Moved this to where we call SessionStarted(). Done.

+
+    return tray()->login_;
+  }
 
   bool CreateDetailedMenu() {
     tray()->ShowDetailedView(0, false);
     return tray()->detailed_menu_ != NULL;
   }
 
   void CloseDetailMenu() {
     CHECK(tray()->detailed_menu_);
     tray()->DestroyDetailedView();
     tray()->detailed_menu_ = NULL;
@@ skipping 1250 matching lines @@
   EXPECT_FALSE(IsSettingsAvailableOnDetailMenu());
   EXPECT_TRUE(IsLargeCursorMenuShownOnDetailMenu());
   EXPECT_TRUE(IsMonoAudioMenuShownOnDetailMenu());
   EXPECT_TRUE(IsCaretHighlightMenuShownOnDetailMenu());
   EXPECT_TRUE(IsHighlightMouseCursorMenuShownOnDetailMenu());
   EXPECT_TRUE(IsHighlightKeyboardFocusMenuShownOnDetailMenu());
   CloseDetailMenu();
 
   session_manager::SessionManager::Get()->SetSessionState(
       session_manager::SessionState::LOGIN_SECONDARY);
   base::RunLoop().RunUntilIdle();  // Flush session state to ash.

[James Cook, 2017/04/05 00:16:24]

optional: This would be better as SessionControllerClient::FlushForTesting().

[xiyuan, 2017/04/05 22:29:07]

Done.

   SetLoginStatus(ash::LoginStatus::USER);
   EXPECT_TRUE(CreateDetailedMenu());
   EXPECT_TRUE(IsSpokenFeedbackMenuShownOnDetailMenu());
   EXPECT_TRUE(IsHighContrastMenuShownOnDetailMenu());
   EXPECT_TRUE(IsScreenMagnifierMenuShownOnDetailMenu());
   EXPECT_TRUE(IsAutoclickMenuShownOnDetailMenu());
   EXPECT_TRUE(IsVirtualKeyboardMenuShownOnDetailMenu());
   EXPECT_FALSE(IsHelpAvailableOnDetailMenu());
   EXPECT_FALSE(IsSettingsAvailableOnDetailMenu());
   EXPECT_TRUE(IsLargeCursorMenuShownOnDetailMenu());
   EXPECT_TRUE(IsMonoAudioMenuShownOnDetailMenu());
   EXPECT_TRUE(IsCaretHighlightMenuShownOnDetailMenu());
   EXPECT_TRUE(IsHighlightMouseCursorMenuShownOnDetailMenu());
   EXPECT_TRUE(IsHighlightKeyboardFocusMenuShownOnDetailMenu());
   CloseDetailMenu();
 }
 
 INSTANTIATE_TEST_CASE_P(TrayAccessibilityTestInstance,
                         TrayAccessibilityTest,
                         testing::Values(PREF_SERVICE,
                                         POLICY));
 
 }  // namespace chromeos