Add test exceptions due to merge fallout
Add test exceptions due to merge fallout

TBR=amanda
TEST=none
BUG=none

Review URL: http://codereview.chromium.org/165285

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

Former-commit-id: d4bfab1297733842ac37fa86630f99d91ba511f7
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