bug 869143: phase2 cleanup for XPCSHELL_TEST conversion. r=mshal