[Sync] Move model_type* from syncable/ to base/

sync/sync.gyp

 # Copyright (c) 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'targets': [
     # The core sync library.
@@ skipping 15 matching lines @@
         '../net/net.gyp:net',
         '../sql/sql.gyp:sql',
         'protocol/sync_proto.gyp:sync_proto',
       ],
       'export_dependent_settings': [
         # Propagate sync_proto since our headers include its generated
         # files.
         'protocol/sync_proto.gyp:sync_proto',
       ],
       'sources': [
+        'internal_api/public/base/enum_set.h',
+        'internal_api/public/base/model_type.h',
+        'internal_api/public/base/model_type_payload_map.cc',
+        'internal_api/public/base/model_type_payload_map.h',
         'internal_api/public/engine/model_safe_worker.cc',
         'internal_api/public/engine/model_safe_worker.h',
         'internal_api/public/engine/passive_model_worker.cc',
         'internal_api/public/engine/passive_model_worker.h',
         'internal_api/public/engine/polling_constants.cc',
         'internal_api/public/engine/polling_constants.h',
         'internal_api/public/engine/sync_status.cc',
         'internal_api/public/engine/sync_status.h',
         'internal_api/public/sessions/model_neutral_state.cc',
         'internal_api/public/sessions/model_neutral_state.h',
         'internal_api/public/sessions/sync_session_snapshot.cc',
         'internal_api/public/sessions/sync_session_snapshot.h',
         'internal_api/public/sessions/sync_source_info.cc',
         'internal_api/public/sessions/sync_source_info.h',
-        'internal_api/public/syncable/model_type.h',
-        'internal_api/public/syncable/model_type_payload_map.cc',
-        'internal_api/public/syncable/model_type_payload_map.h',
-        'internal_api/public/util/enum_set.h',
         'internal_api/public/util/experiments.h',
         'internal_api/public/util/immutable.h',
         'internal_api/public/util/syncer_error.cc',
         'internal_api/public/util/syncer_error.h',
         'internal_api/public/util/report_unrecoverable_error_function.h',
         'internal_api/public/util/unrecoverable_error_handler.h',
         'internal_api/public/util/unrecoverable_error_info.h',
         'internal_api/public/util/unrecoverable_error_info.cc',
         'internal_api/public/util/weak_handle.cc',
         'internal_api/public/util/weak_handle.h',
@@ skipping 311 matching lines @@
         'protocol/sync_proto.gyp:sync_proto',
         'sync',
       ],
       'export_dependent_settings': [
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         'protocol/sync_proto.gyp:sync_proto',
         'sync',
       ],
       'sources': [
-        'internal_api/public/syncable/model_type_test_util.cc',
-        'internal_api/public/syncable/model_type_test_util.h',
+        'internal_api/public/base/model_type_test_util.cc',
+        'internal_api/public/base/model_type_test_util.h',
         'js/js_test_util.cc',
         'js/js_test_util.h',
         'sessions/test_util.cc',
         'sessions/test_util.h',
         'syncable/syncable_mock.cc',
         'syncable/syncable_mock.h',
         'test/engine/fake_model_worker.cc',
         'test/engine/fake_model_worker.h',
         'test/engine/mock_connection_manager.cc',
         'test/engine/mock_connection_manager.h',
@@ skipping 120 matching lines @@
         'protocol/sync_proto.gyp:sync_proto',
         'sync',
         'test_support_sync',
       ],
       'direct_dependent_settings': {
         'variables': { 'enable_wexit_time_destructors': 1, },
         'include_dirs': [
           '..',
         ],
         'sources': [
+          'internal_api/public/base/enum_set_unittest.cc',
+          'internal_api/public/base/model_type_payload_map_unittest.cc',
           'internal_api/public/engine/model_safe_worker_unittest.cc',
-          'internal_api/public/syncable/model_type_payload_map_unittest.cc',
-          'internal_api/public/util/enum_set_unittest.cc',
           'internal_api/public/util/immutable_unittest.cc',
           'engine/apply_updates_command_unittest.cc',
           'engine/build_commit_command_unittest.cc',
           'engine/cleanup_disabled_types_command_unittest.cc',
           'engine/download_updates_command_unittest.cc',
           'engine/model_changing_syncer_command_unittest.cc',
           'engine/process_commit_response_command_unittest.cc',
           'engine/process_updates_command_unittest.cc',
           'engine/resolve_conflicts_command_unittest.cc',
           'engine/syncer_proto_util_unittest.cc',
@@ skipping 248 matching lines @@
             'test_suite_name': 'sync_unit_tests',
             'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)sync_unit_tests<(SHARED_LIB_SUFFIX)',
             'input_jars_paths': [ '<(PRODUCT_DIR)/lib.java/chromium_base.jar', ],
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
       ],
     }],
   ],
 }