GitLab

This is remaining part of r221334, because during its code review,
VolumeManager was actively being changed so that it was kept as is to avoid
conflict.

BUG=273386
TEST=Ran unit_tests

Review URL: https://chromiumcodereview.appspot.com/23892008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221650 0039d316-1c4b-4281-b951-d872f2087c98