[Chrome OS MD] Implement accessibility detailed view for the MD Ash system menu

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/material_design/material_design_controller.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 "ash/test/test_session_state_delegate.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 845 matching lines @@
   CloseDetailMenu();
 
   SetLoginStatus(ash::LoginStatus::USER);
   EXPECT_TRUE(CreateDetailedMenu());
   EXPECT_TRUE(IsSpokenFeedbackMenuShownOnDetailMenu());
   EXPECT_TRUE(IsHighContrastMenuShownOnDetailMenu());
   EXPECT_TRUE(IsScreenMagnifierMenuShownOnDetailMenu());
   EXPECT_FALSE(IsLargeCursorMenuShownOnDetailMenu());
   EXPECT_TRUE(IsAutoclickMenuShownOnDetailMenu());
   EXPECT_TRUE(IsVirtualKeyboardMenuShownOnDetailMenu());
-  EXPECT_TRUE(IsHelpShownOnDetailMenu());
-  EXPECT_TRUE(IsSettingsShownOnDetailMenu());
+  if (!ash::MaterialDesignController::IsSystemTrayMenuMaterial()) {

[tdanderson, 2016/09/15 16:13:26]

nit (possibly personal preference): in an if-else situation, the code reads
easier if you avoid ! in the boolean expression. So:

if (IsSystemTrayMenuMaterial()) {
  ...
} else {
  ...
}

here and at line 891.

[yiyix, 2016/09/19 20:24:55]

Done.

+    EXPECT_TRUE(IsHelpShownOnDetailMenu());
+    EXPECT_TRUE(IsSettingsShownOnDetailMenu());
+  } else {
+    EXPECT_FALSE(IsHelpShownOnDetailMenu());
+    EXPECT_FALSE(IsSettingsShownOnDetailMenu());
+  }
   CloseDetailMenu();
 
   SetLoginStatus(ash::LoginStatus::LOCKED);
   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());
+
+  if (!ash::MaterialDesignController::IsSystemTrayMenuMaterial()) {
+    EXPECT_FALSE(IsHelpShownOnDetailMenu());
+    EXPECT_FALSE(IsSettingsShownOnDetailMenu());
+  } else {
+    EXPECT_FALSE(IsHelpShownOnDetailMenu());

[tdanderson, 2016/09/15 16:13:26]

EXPECT_TRUE?

[yiyix, 2016/09/19 20:24:55]

Done.

+    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::LoginStatus::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();
 }
 
 INSTANTIATE_TEST_CASE_P(TrayAccessibilityTestInstance,
                         TrayAccessibilityTest,
                         testing::Values(PREF_SERVICE,
                                         POLICY));
 
 }  // namespace chromeos