Merge 208347 "Revert 208315 "Make use of InvalidationService""

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 880 matching lines @@
         'browser/infobars/infobar_service.cc',
         'browser/infobars/infobar_service.h',
         'browser/infobars/insecure_content_infobar_delegate.cc',
         'browser/infobars/insecure_content_infobar_delegate.h',
         'browser/infobars/simple_alert_infobar_delegate.cc',
         'browser/infobars/simple_alert_infobar_delegate.h',
         'browser/internal_auth.cc',
         'browser/internal_auth.h',
         'browser/intranet_redirect_detector.cc',
         'browser/intranet_redirect_detector.h',
-        'browser/invalidation/fake_invalidation_service.cc',
-        'browser/invalidation/fake_invalidation_service.h',
-        'browser/invalidation/invalidation_service.h',
+        'browser/invalidation/invalidation_frontend.h',
         'browser/invalidation/invalidation_service_android.cc',
         'browser/invalidation/invalidation_service_android.h',
         'browser/invalidation/invalidation_service_factory.cc',
         'browser/invalidation/invalidation_service_factory.h',
         'browser/invalidation/invalidation_service_util.cc',
         'browser/invalidation/invalidation_service_util.h',
         'browser/invalidation/invalidator_storage.cc',
         'browser/invalidation/invalidator_storage.h',
         'browser/invalidation/p2p_invalidation_service.cc',
         'browser/invalidation/p2p_invalidation_service.h',
@@ skipping 1072 matching lines @@
         'browser/storage_monitor/udev_util_linux.cc',
         'browser/storage_monitor/udev_util_linux.h',
         'browser/storage_monitor/volume_mount_watcher_win.cc',
         'browser/storage_monitor/volume_mount_watcher_win.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/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/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.cc',
         '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',
@@ skipping 14 matching lines @@
         'browser/sync/glue/data_type_encryption_handler.cc',
         'browser/sync/glue/data_type_encryption_handler.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',
+        'browser/sync/glue/dummy_invalidator.cc',
+        'browser/sync/glue/dummy_invalidator.h',
         'browser/sync/glue/extension_data_type_controller.cc',
         'browser/sync/glue/extension_data_type_controller.h',
         'browser/sync/glue/extension_setting_data_type_controller.cc',
         'browser/sync/glue/extension_setting_data_type_controller.h',
         'browser/sync/glue/failed_data_types_handler.cc',
         'browser/sync/glue/failed_data_types_handler.h',
         'browser/sync/glue/favicon_cache.cc',
         'browser/sync/glue/favicon_cache.h',
         'browser/sync/glue/frontend_data_type_controller.cc',
         'browser/sync/glue/frontend_data_type_controller.h',
@@ skipping 69 matching lines @@
         'browser/sync/profile_sync_service.h',
         'browser/sync/profile_sync_service_android.cc',
         'browser/sync/profile_sync_service_android.h',
         'browser/sync/profile_sync_service_base.h',
         'browser/sync/profile_sync_service_base.cc',
         'browser/sync/profile_sync_service_factory.cc',
         'browser/sync/profile_sync_service_factory.h',
         'browser/sync/profile_sync_service_harness.cc',
         'browser/sync/profile_sync_service_harness.h',
         'browser/sync/profile_sync_service_model_type_selection_android.h',
-        'browser/sync/profile_sync_service_observer.cc',
         'browser/sync/profile_sync_service_observer.h',
         'browser/sync/retry_verifier.cc',
         'browser/sync/retry_verifier.h',
         'browser/sync/sync_startup_tracker.cc',
         'browser/sync/sync_startup_tracker.h',
         'browser/sync/sync_global_error.cc',
         'browser/sync/sync_global_error.h',
         'browser/sync/sync_prefs.cc',
         'browser/sync/sync_prefs.h',
         'browser/sync/sync_ui_util.cc',
@@ skipping 1205 matching lines @@
             'package_name': 'org/chromium/chrome/browser/ui/toolbar',
             'template_deps': ['browser/ui/toolbar/toolbar_model_security_level_list.h'],
           },
           'includes': [ '../build/android/java_cpp_template.gypi' ],
         },
       ],
      },
     ],
   ],
 }