Revert 222957 "Refactors TestSystemTrayDelegate into DefaultSyst..."