Bug 41529 adds a new version of addUser(Script|Style)ToGroup on mac that supports injecting in just the top frame, and deprecates the old one that doesn't support that. The deprecated form should be removed. Also the new version should be added to Windows.
Also, the tests should be un-skipped on Windows.