[webkit-reviews] review requested: [Bug 56800] [fileapi] New resolve url tests don't pass on Chromium. Skipping them. : [Attachment 86523] Fixed merge conflicts

[bugzilla-daemon at webkit.org]

Adam Klein <adamk at chromium.org> has asked  for review:
Bug 56800: [fileapi] New resolve url tests don't pass on Chromium. Skipping
them.
https://bugs.webkit.org/show_bug.cgi?id=56800

Attachment 86523: Fixed merge conflicts
https://bugs.webkit.org/attachment.cgi?id=86523&action=review