Fix bad merge
Bug 945222 - web-platform-tests integration into Mozilla tree.
[mq]: fileaccess