Bug 887494 - Fix struct/class mismatch introduced by part 4 of 884124.  r=nnethercote.

--HG--
extra : rebase_source : 512f9f8c521c62c2efd4304dcca2205d82d7f8a5