SyncFS: Add ConflictResolverTest

chrome/chrome_tests_unit.gypi

 # Copyright 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 {
   'targets': [
     {
       # This target contains mocks and test utilities that don't belong in
       # production libraries but are used by more than one test executable.
       'target_name': 'test_support_common',
       'type': 'static_library',
@@ skipping 1356 matching lines @@
         'browser/sync/sessions2/tab_node_pool2_unittest.cc',
         'browser/sync/sync_global_error_unittest.cc',
         'browser/sync/sync_policy_handler_unittest.cc',
         'browser/sync/sync_prefs_unittest.cc',
         'browser/sync/sync_startup_tracker_unittest.cc',
         'browser/sync/sync_ui_util_unittest.cc',
         'browser/sync/test/test_http_bridge_factory.cc',
         'browser/sync/test/test_http_bridge_factory.h',
         'browser/sync/test_profile_sync_service.cc',
         'browser/sync/test_profile_sync_service.h',
+        'browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc',
         'browser/sync_file_system/drive_backend/drive_backend_test_util.cc',
         'browser/sync_file_system/drive_backend/drive_backend_test_util.h',
         'browser/sync_file_system/drive_backend/list_changes_task_unittest.cc',
         'browser/sync_file_system/drive_backend/local_to_remote_syncer_unittest.cc',
         'browser/sync_file_system/drive_backend/metadata_database_unittest.cc',
         'browser/sync_file_system/drive_backend/metadata_db_migration_util_unittest.cc',
         'browser/sync_file_system/drive_backend/register_app_task_unittest.cc',
         'browser/sync_file_system/drive_backend/remote_to_local_syncer_unittest.cc',
         'browser/sync_file_system/drive_backend/sync_engine_initializer_unittest.cc',
         'browser/sync_file_system/drive_backend/sync_engine_unittest.cc',
@@ skipping 1545 matching lines @@
             'browser/ui/app_list/test/fake_profile_store.cc',
             'browser/ui/app_list/test/fake_profile_store.h',
             'browser/ui/app_list/test/fast_show_pickler_unittest.cc',
             'browser/ui/views/app_list/win/app_list_win_unittest.cc',
           ],
         },
       ],
     }],
   ],  # 'conditions'
 }