[SyncFS] Add ConflictResolver and Implement LocalToRemoteSyncer::HandleConflict

BUG=240165

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237755 0039d316-1c4b-4281-b951-d872f2087c98
SVN changes up to revision 237755
[Mojo] Introduce gles2 service

This CL introduces a Mojo service for GLES2 and uses that service to better
structure the sample_app's use of GL. The implementation of the service lives
in mojo/services/gles2 and currently creates an in-process command buffer. The
implementation of the client lives in public/bindings/gles2_client, which wires
up the command buffer to gles2_c_lib. When using public/bindings/gles2_client,
Mojo applications can now use GL via the normal C API.

BUG=none

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

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