Revert 94128 - [Sync] Refactor sync datatype error handling.

chrome/chrome_tests.gypi

 # Copyright (c) 2011 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.
 
 {
   'variables' : {
     'pyautolib_sources': [
       'app/chrome_command_ids.h',
       'app/chrome_dll_resource.h',
       'common/automation_constants.h',
@@ skipping 3286 matching lines @@
           ],
         }], # OS="win"
       ], # conditions
     },
     {
       'target_name': 'sync_unit_tests',
       'type': 'executable',
       'sources': [
         '<(protoc_out_dir)/chrome/browser/sync/protocol/test.pb.cc',
         'app/breakpad_mac_stubs.mm',
-        'browser/sync/api/sync_change_unittest.cc',
-        'browser/sync/api/sync_error_unittest.cc',
         'browser/sync/engine/apply_updates_command_unittest.cc',
         'browser/sync/engine/build_commit_command_unittest.cc',
         'browser/sync/engine/clear_data_command_unittest.cc',
         'browser/sync/engine/cleanup_disabled_types_command_unittest.cc',
         'browser/sync/engine/download_updates_command_unittest.cc',
         'browser/sync/engine/mock_model_safe_workers.cc',
         'browser/sync/engine/mock_model_safe_workers.h',
         'browser/sync/engine/process_commit_response_command_unittest.cc',
         'browser/sync/engine/syncapi_unittest.cc',
         'browser/sync/engine/syncer_proto_util_unittest.cc',
@@ skipping 22 matching lines @@
         'browser/sync/sessions/sync_session_unittest.cc',
         'browser/sync/sessions/test_util.cc',
         'browser/sync/sessions/test_util.h',
         'browser/sync/syncable/directory_backing_store_unittest.cc',
         'browser/sync/syncable/model_type_payload_map_unittest.cc',
         'browser/sync/syncable/model_type_unittest.cc',
         'browser/sync/syncable/nigori_util_unittest.cc',
         'browser/sync/syncable/syncable_enum_conversions_unittest.cc',
         'browser/sync/syncable/syncable_id_unittest.cc',
         'browser/sync/syncable/syncable_unittest.cc',
+        'browser/sync/api/sync_change_unittest.cc',
         'browser/sync/util/data_encryption_unittest.cc',
         'browser/sync/util/extensions_activity_monitor_unittest.cc',
         'browser/sync/util/protobuf_unittest.cc',
         'browser/sync/util/user_settings_unittest.cc',
         'test/sync/engine/mock_connection_manager.cc',
         'test/sync/engine/mock_connection_manager.h',
         'test/sync/engine/mock_gaia_authenticator.cc',
         'test/sync/engine/mock_gaia_authenticator.h',
         'test/sync/engine/mock_gaia_authenticator_unittest.cc',
         'test/sync/engine/syncer_command_test.h',
@@ skipping 997 matching lines @@
               # Use outputs of this action as inputs for the main target build.
               # Seems as a misnomer but makes this happy on Linux (scons).
               'process_outputs_as_sources': 1,
             },
           ],  # 'actions'
         },
       ]
     }],  # 'coverage!=0'
   ],  # 'conditions'
 }