Make sure the histogram counters for about:conflicts get uploaded.
Make sure the histogram counters for about:conflicts get uploaded.

BUG=51105
TEST=None

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

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

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