Add cleanup in case the measurements fail

BUG=

Review URL: https://codereview.chromium.org/181833013

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255086 0039d316-1c4b-4281-b951-d872f2087c98
SVN changes up to revision 255086