Separate local and remote sync invalidations

chrome/chrome_browser.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': [
     {
       'target_name': 'browser',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
@@ skipping 1884 matching lines @@
         'browser/status_icons/status_tray.cc',
         'browser/status_icons/status_tray.h',
         'browser/sync/about_sync_util.cc',
         'browser/sync/about_sync_util.h',
         'browser/sync/backend_migrator.cc',
         'browser/sync/backend_migrator.h',
         'browser/sync/backend_unrecoverable_error_handler.cc',
         'browser/sync/backend_unrecoverable_error_handler.h',
         'browser/sync/failed_datatypes_handler.cc',
         'browser/sync/failed_datatypes_handler.h',
+        'browser/sync/glue/android_invalidator_bridge.cc',
+        'browser/sync/glue/android_invalidator_bridge.h',
+        'browser/sync/glue/android_invalidator_bridge_proxy.cc',
+        'browser/sync/glue/android_invalidator_bridge_proxy.h',
         'browser/sync/glue/app_notification_data_type_controller.cc',
         'browser/sync/glue/app_notification_data_type_controller.h',
         'browser/sync/glue/autofill_data_type_controller.cc',
         'browser/sync/glue/autofill_data_type_controller.h',
         'browser/sync/glue/autofill_profile_data_type_controller.cc',
         'browser/sync/glue/autofill_profile_data_type_controller.h',
         'browser/sync/glue/backend_data_type_configurer.h',
         'browser/sync/glue/bookmark_change_processor.cc',
         'browser/sync/glue/bookmark_change_processor.h',
         'browser/sync/glue/bookmark_data_type_controller.cc',
         'browser/sync/glue/bookmark_data_type_controller.h',
         'browser/sync/glue/bookmark_model_associator.cc',
         'browser/sync/glue/bookmark_model_associator.h',
-        'browser/sync/glue/bridged_invalidator.cc',
-        'browser/sync/glue/bridged_invalidator.h',
         'browser/sync/glue/browser_thread_model_worker.cc',
         'browser/sync/glue/browser_thread_model_worker.h',
         'browser/sync/glue/change_processor.cc',
         'browser/sync/glue/change_processor.h',
         'browser/sync/glue/chrome_encryptor.cc',
         'browser/sync/glue/chrome_encryptor.h',
         'browser/sync/glue/chrome_extensions_activity_monitor.cc',
         'browser/sync/glue/chrome_extensions_activity_monitor.h',
         'browser/sync/glue/chrome_report_unrecoverable_error.cc',
         'browser/sync/glue/chrome_report_unrecoverable_error.h',
-        'browser/sync/glue/chrome_sync_notification_bridge.cc',
-        'browser/sync/glue/chrome_sync_notification_bridge.h',
         'browser/sync/glue/data_type_controller.cc',
         'browser/sync/glue/data_type_controller.h',
         'browser/sync/glue/data_type_error_handler.h',
         'browser/sync/glue/data_type_manager.cc',
         'browser/sync/glue/data_type_manager.h',
         'browser/sync/glue/data_type_manager_impl.cc',
         'browser/sync/glue/data_type_manager_impl.h',
         'browser/sync/glue/data_type_manager_observer.h',
         'browser/sync/glue/device_info.cc',
         'browser/sync/glue/device_info.h',
@@ skipping 1166 matching lines @@
           'variables': {
             'jni_gen_dir': 'chrome',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
       ],
      },
     ],
   ],
 }