chromeos: Introduce ash::SystemTrayTestApi

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 d1ad2a1970f86a7de1f11d8f6488250860b30a69..b29f713445b4d7a6c4d8f239306deee80befbb5b 100644
--- a/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc
+++ b/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc
@@ -7,6 +7,7 @@
 #include "ash/magnifier/magnification_controller.h"
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
+#include "ash/system/tray/system_tray_test_api.h"
 #include "ash/system/tray_accessibility.h"
 #include "ash/test/shell_test_api.h"
 #include "base/callback.h"
@@ -115,15 +116,13 @@ class TrayAccessibilityTest
   }
 
   ash::TrayAccessibility* tray() {
-    return ash::Shell::Get()
-        ->GetPrimarySystemTray()
-        ->GetTrayAccessibilityForTest();
+    return const_cast<ash::TrayAccessibility*>(
+        static_cast<const TrayAccessibilityTest*>(this)->tray());

[xiyuan, 2017/06/07 16:29:08]

nit: static_cast -> const_cast ?

[James Cook, 2017/06/07 16:35:53]

Done. Stack Overflow steered me wrong. :-)

   }
 
   const ash::TrayAccessibility* tray() const {
-    return ash::Shell::Get()
-        ->GetPrimarySystemTray()
-        ->GetTrayAccessibilityForTest();
+    return ash::SystemTrayTestApi(ash::Shell::Get()->GetPrimarySystemTray())
+        .tray_accessibility();
   }
 
   bool IsTrayIconVisible() const { return tray()->tray_icon_visible_; }