Linux: update test expectations for merge failures.
Linux: update test expectations for merge failures.

(These are failures not caused by the scrollbars change)


git-svn-id: http://src.chromium.org/svn/trunk/src@12514 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

Former-commit-id: a22c4e917a02e8963d9628d58809590e974e1ba5
meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser