Bug 822289 eliminated the NS_IMPL_CYCLE_COLLECTION_CLASS macro, thus busting our builds, which call that macro. According to the patch in bug 822289, the correct thing to do is to simply remove the macro - it appears to no longer be necessary.
Created attachment 703641 [details] [diff] [review] Fix I've confirmed that this fixes my local build. Landing with r=bustage-fix.
Landed on comm-central as https://hg.mozilla.org/comm-central/rev/393bcf57ae31