SyncFS: Fix conflict resolver for multiple parents


BUG=240165
TEST=unit_tests --gtest_filter=ConflictResolverTest.*

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238373 0039d316-1c4b-4281-b951-d872f2087c98
SVN changes up to revision 238373
Update page cycler to differenciate between cold and warm run by default.

BUG=271176

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

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