chromeos: Introduce ash::SystemTrayTestApi

ash/system/tray/system_tray.h

Index: ash/system/tray/system_tray.h
diff --git a/ash/system/tray/system_tray.h b/ash/system/tray/system_tray.h
index ebc7afc7762ff4d5ddc30329dd319c65a7df032d..1d93177905b4f9b9d978819f797b932a60855e75 100644
--- a/ash/system/tray/system_tray.h
+++ b/ash/system/tray/system_tray.h
@@ -138,22 +138,11 @@ class ASH_EXPORT SystemTray : public TrayBackgroundView,
   ScreenTrayItem* GetScreenShareItem() { return screen_share_tray_item_; }
   ScreenTrayItem* GetScreenCaptureItem() { return screen_capture_tray_item_; }
 
-  TrayAccessibility* GetTrayAccessibilityForTest() {
-    return tray_accessibility_;
-  }
-
-  // TODO(jamescook): Add a SystemTrayTestApi instead of these methods.
-  TrayCast* GetTrayCastForTesting() const;
-  TrayEnterprise* GetTrayEnterpriseForTesting() const;
-  TrayNetwork* GetTrayNetworkForTesting() const;
-  TraySupervisedUser* GetTraySupervisedUserForTesting() const;
-  TraySystemInfo* GetTraySystemInfoForTesting() const;
-  TrayTiles* GetTrayTilesForTesting() const;
-
   // Activates the system tray bubble.
   void ActivateBubble();
 
  private:
+  friend class SystemTrayTestApi;
   class ActivationObserver;
 
   // Closes the bubble. Used to bind as a KeyEventWatcher::KeyEventCallback.