Bug 880330 - Refactor xpconnect to use the new options API; r=bholley