In Bug 943976 we had a programming mistake: the author specified an object name twice in the MocksHelper constructor. When this happens, we save the original object twice, which means that the second time, we save the mock. Then when we "restore" it, we restore the mock instead of the original object. This patch will fail early when there is such a programming mistake.

Rik, I think you're a good person to review this, but feel free to say if you don't feel comfortable enough. I'd ask Etienne ;)

Comment on attachment 8387675 [details] github PR It might not be a big win but I think checking for uniqueness by sorting the array and then comparing with the previous item will be a bit faster. And should read better. Also, two tests are actually failing because of this so they'll need to be fixed before landing.

Comment on attachment 8387675 [details] github PR Updated the patch, Travis is green, I locally checked it was still working as expected. I also fixed the jshint issues.

Comment on attachment 8387675 [details] github PR r=me with the comment about comment on Github addressed.

Here is a comment about the comment I added to address your comment in comment 4. Pushed a rebased version and waiting for Travis.

master: 28497d16c9f5d3feafaf3ca5b45cabd2df157366