Revert r148496 "Refactor sync-specific parts out of SyncNotifier/SyncNotifierObserver"

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 232 matching lines @@
         '../third_party/libjingle/libjingle.gyp:libjingle',
         'sync',
       ],
       'export_dependent_settings': [
         '../jingle/jingle.gyp:notifier',
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
       ],
       'sources': [
         'notifier/invalidation_util.cc',
         'notifier/invalidation_util.h',
+        'notifier/notifications_disabled_reason.h',
         'notifier/notifications_disabled_reason.cc',
-        'notifier/notifications_disabled_reason.h',
-        'notifier/object_id_payload_map.cc',
-        'notifier/object_id_payload_map.h',
         'notifier/sync_notifier.h',
+        'notifier/sync_notifier_factory.h',
         'notifier/sync_notifier_factory.cc',
-        'notifier/sync_notifier_factory.h',
-        'notifier/sync_notifier_helper.cc',
-        'notifier/sync_notifier_helper.h',
         'notifier/sync_notifier_observer.h',
       ],
       'conditions': [
         ['OS != "android"', {
           'sources': [
             'notifier/chrome_invalidation_client.cc',
             'notifier/chrome_invalidation_client.h',
             'notifier/chrome_system_resources.cc',
             'notifier/chrome_system_resources.h',
+            'notifier/invalidation_notifier.h',
             'notifier/invalidation_notifier.cc',
-            'notifier/invalidation_notifier.h',
             'notifier/invalidation_state_tracker.h',
+            'notifier/non_blocking_invalidation_notifier.h',
             'notifier/non_blocking_invalidation_notifier.cc',
-            'notifier/non_blocking_invalidation_notifier.h',
+            'notifier/p2p_notifier.h',
             'notifier/p2p_notifier.cc',
-            'notifier/p2p_notifier.h',
             'notifier/push_client_channel.cc',
             'notifier/push_client_channel.h',
             'notifier/registration_manager.cc',
             'notifier/registration_manager.h',
             'notifier/state_writer.h',
           ],
         }],
       ],
     },
 
@@ skipping 358 matching lines @@
         'conditions': [
           ['OS != "android"', {
             'sources': [
               'notifier/chrome_invalidation_client_unittest.cc',
               'notifier/chrome_system_resources_unittest.cc',
               'notifier/invalidation_notifier_unittest.cc',
               'notifier/non_blocking_invalidation_notifier_unittest.cc',
               'notifier/p2p_notifier_unittest.cc',
               'notifier/push_client_channel_unittest.cc',
               'notifier/registration_manager_unittest.cc',
-              'notifier/sync_notifier_helper_unittest.cc',
             ],
           }],
         ],
       },
     },
 
     # Unit tests for the 'syncapi_core' target.  This cannot be a static
     # library because the unit test files have to be compiled directly
     # into the executable, so we push the target files to the
     # depending executable target via direct_dependent_settings.
@@ skipping 173 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' ],
         },
       ],
     }],
   ],
 }