Add accessibility related notification to notification center

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/accessibility_types.h"
 #include "ash/login_status.h"
 #include "ash/magnifier/magnification_controller.h"
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray_accessibility.h"
@@ skipping 20 matching lines @@
 #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"
 #include "components/policy/policy_constants.h"
 #include "components/prefs/pref_service.h"
 #include "components/session_manager/core/session_manager.h"
 #include "content/public/test/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/message_center/message_center.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/button/custom_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/widget/widget.h"
 
 using extensions::api::braille_display_private::BrailleObserver;
 using extensions::api::braille_display_private::DisplayState;
 using extensions::api::braille_display_private::MockBrailleController;
 using testing::Return;
 using testing::_;
@@ skipping 282 matching lines @@
            views::Button::STATE_NORMAL;
   }
 
   // In material design we show the settings button but theme it as disabled if
   // it is not possible to load the settings page.
   bool IsSettingsAvailableOnDetailMenu() const {
     return tray()->detailed_menu_->settings_view_->state() ==
            views::Button::STATE_NORMAL;
   }
 
-  bool IsNotificationShown() const {
-    return (tray()->detailed_popup_ &&
-            !tray()->detailed_popup_->GetWidget()->IsClosed());
-  }
-
-  base::string16 GetNotificationText() const {
-    if (IsNotificationShown())
-      return tray()->detailed_popup_->label_for_test()->text();
-    else
-      return base::string16();
-  }
-
   void SetBrailleConnected(bool connected) {
     braille_controller_.SetAvailable(connected);
     braille_controller_.GetObserver()->OnBrailleDisplayStateChanged(
         *braille_controller_.GetDisplayState());
   }
 
   policy::MockConfigurationPolicyProvider provider_;
   MockBrailleController braille_controller_;
 };
 
@@ skipping 568 matching lines @@
 
   SetShowAccessibilityOptionsInSystemTrayMenu(false);
 
   // Confirms that the menu remains visible.
   EXPECT_TRUE(CanCreateMenuItem());
 }
 
 IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, ShowNotification) {
   const base::string16 BRAILLE_CONNECTED =
       base::ASCIIToUTF16("Braille display connected.");
-  const base::string16 CHROMEVOX_ENABLED = base::ASCIIToUTF16(
-      "ChromeVox (spoken feedback) is enabled.\nPress Ctrl+Alt+Z to disable.");
-  const base::string16 BRAILLE_CONNECTED_AND_CHROMEVOX_ENABLED(
-      BRAILLE_CONNECTED + base::ASCIIToUTF16(" ") + CHROMEVOX_ENABLED);
+  const base::string16 CHROMEVOX_ENABLED_TITLE =
+      base::ASCIIToUTF16("ChromeVox enabled");
+  const base::string16 CHROMEVOX_ENABLED =
+      base::ASCIIToUTF16("Press Ctrl + Alt + Z to disable spoken feedback.");
+  const base::string16 BRAILLE_CONNECTED_AND_CHROMEVOX_ENABLED_TITLE =
+      base::ASCIIToUTF16("Braille and ChromeVox are enabled");
 
   EXPECT_FALSE(AccessibilityManager::Get()->IsSpokenFeedbackEnabled());
 
   // Enabling spoken feedback should show the notification.
   AccessibilityManager::Get()->EnableSpokenFeedback(
       true, ash::A11Y_NOTIFICATION_SHOW);
-  EXPECT_EQ(CHROMEVOX_ENABLED, GetNotificationText());
+  message_center::NotificationList::Notifications notifications =
+      message_center::MessageCenter::Get()->GetVisibleNotifications();
+  EXPECT_EQ(1u, notifications.size());
+  EXPECT_EQ(CHROMEVOX_ENABLED_TITLE, (*notifications.begin())->title());
+  EXPECT_EQ(CHROMEVOX_ENABLED, (*notifications.begin())->message());
 
   // Connecting a braille display when spoken feedback is already enabled
   // should only show the message about the braille display.
   SetBrailleConnected(true);
-  EXPECT_EQ(BRAILLE_CONNECTED, GetNotificationText());
+  notifications =
+      message_center::MessageCenter::Get()->GetVisibleNotifications();

[James Cook, 2017/05/16 00:56:19]

optional: if you want to make lines like this (and 945) shorter, feel free to
add "using message_center::MessageCenter" at file scope

+  EXPECT_EQ(1u, notifications.size());
+  EXPECT_EQ(base::string16(), (*notifications.begin())->title());
+  EXPECT_EQ(BRAILLE_CONNECTED, (*notifications.begin())->message());
 
   // Neither disconnecting a braille display, nor disabling spoken feedback
   // should show any notification.
   SetBrailleConnected(false);
   EXPECT_TRUE(AccessibilityManager::Get()->IsSpokenFeedbackEnabled());
-  EXPECT_FALSE(IsNotificationShown());
+  notifications =
+      message_center::MessageCenter::Get()->GetVisibleNotifications();
+  EXPECT_EQ(0u, notifications.size());
   AccessibilityManager::Get()->EnableSpokenFeedback(
       false, ash::A11Y_NOTIFICATION_SHOW);
-  EXPECT_FALSE(IsNotificationShown());
+  notifications =
+      message_center::MessageCenter::Get()->GetVisibleNotifications();
+  EXPECT_EQ(0u, notifications.size());
   EXPECT_FALSE(AccessibilityManager::Get()->IsSpokenFeedbackEnabled());
 
   // Connecting a braille display should enable spoken feedback and show
   // both messages.
   SetBrailleConnected(true);
   EXPECT_TRUE(AccessibilityManager::Get()->IsSpokenFeedbackEnabled());
-  EXPECT_EQ(BRAILLE_CONNECTED_AND_CHROMEVOX_ENABLED, GetNotificationText());
+  notifications =
+      message_center::MessageCenter::Get()->GetVisibleNotifications();
+  EXPECT_EQ(BRAILLE_CONNECTED_AND_CHROMEVOX_ENABLED_TITLE,
+            (*notifications.begin())->title());
+  EXPECT_EQ(CHROMEVOX_ENABLED, (*notifications.begin())->message());
 }

[James Cook, 2017/05/16 00:56:19]

Thanks for fixing up the tests!

[yiyix, 2017/05/19 02:29:56]

:) you are welcome

 
 IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, KeepMenuVisibilityOnLockScreen) {
   // Enables high contrast mode.
   AccessibilityManager::Get()->EnableHighContrast(true);
   EXPECT_TRUE(CanCreateMenuItem());
 
   // Locks the screen.
   SetLoginStatus(ash::LoginStatus::LOCKED);
   EXPECT_TRUE(CanCreateMenuItem());
 
@@ skipping 718 matching lines @@
   EXPECT_TRUE(IsTapDraggingMenuShownOnDetailMenu());
   CloseDetailMenu();
 }
 
 INSTANTIATE_TEST_CASE_P(TrayAccessibilityTestInstance,
                         TrayAccessibilityTest,
                         testing::Values(PREF_SERVICE,
                                         POLICY));
 
 }  // namespace chromeos