Reduce local overrides on my way to figuring out what's up
Reduce local overrides on my way to figuring out what's up

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/5994003

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

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