The recent changes from bug 493748 broken check-one testing. The attached patch fixes some references to shadowed variables that were missing self prefixes.

These changes may already be addressed by Serge's patch in bug 493748, by the way. Fortunately ted is on the hook for both reviews, so I guess he'll sort things out.

Yeah, it looks like they're all included in his changes. This patch applies to e10s without any conflicts, though.

I'm guessing the "right" way to fix is for mozilla-central to take serge's patch for bug 493748, then have that slurped into the e10s branch via a merge. That said, this is breaking debugging (make check-interactive is also busted), so perhaps we ought to move on it sooner. I'm cc-ing bsmedberg, who knows more about how we do merges.

It's broken on m-c too, so we should take the patch there.

Ftr, Josh's patch here should fix the --test-path regression. My patch there fixes additional code nits (only).

Checked into m-c: 5723b43063b6. Thanks Josh! Will land in e10s as soon as I merge from m-c, today.