Massive refactor of the Android invalidation code.

components/components_tests.gyp

 # Copyright 2014 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': {
     # This turns on e.g. the filename-based detection of which
     # platforms to include source files on (e.g. files ending in
     # _mac.h or _mac.cc are only compiled on MacOSX).
     'chromium_code': 1,
@@ skipping 582 matching lines @@
                   '$(SDKROOT)/System/Library/Frameworks/AddressBook.framework',
                   '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
                   '$(SDKROOT)/System/Library/Frameworks/ImageCaptureCore.framework',
                 ],
               },
               'sources!': [
                 'password_manager/core/browser/password_store_default_unittest.cc',
               ],
             }],
             ['OS == "android"', {
+              'sources': [
+                'invalidation/invalidation_service_android_unittest.cc',
+              ],
               'sources!': [
                 'gcm_driver/gcm_account_mapper_unittest.cc',
                 'gcm_driver/gcm_channel_status_request_unittest.cc',
                 'gcm_driver/gcm_client_impl_unittest.cc',
                 'gcm_driver/gcm_delayed_task_controller_unittest.cc',
                 'gcm_driver/gcm_driver_desktop_unittest.cc',
+                'gcm_driver/gcm_stats_recorder_impl_unittest.cc',
                 'feedback/feedback_common_unittest.cc',
                 'feedback/feedback_data_unittest.cc',
                 'feedback/feedback_uploader_unittest.cc',
-                'gcm_driver/gcm_stats_recorder_impl_unittest.cc',
                 'signin/core/browser/mutable_profile_oauth2_token_service_unittest.cc',
                 'storage_monitor/media_storage_util_unittest.cc',
                 'storage_monitor/storage_info_unittest.cc',
                 'storage_monitor/storage_monitor_unittest.cc',
                 'web_modal/web_contents_modal_dialog_manager_unittest.cc',
               ],
               'dependencies': [
                 '../testing/android/native_test.gyp:native_test_native_code',
                 'components.gyp:history_core_android',
               ],
@@ skipping 212 matching lines @@
         },
       ],
       'conditions': [
         ['OS == "android"', {
           'targets': [
             {
               'target_name': 'components_unittests_apk',
               'type': 'none',
               'dependencies': [
                 'components_unittests',
+                'components.gyp:invalidation_java',
               ],
               'variables': {
                 'test_suite_name': 'components_unittests',
               },
               'includes': [ '../build/apk_test.gypi' ],
             },
           ],
         }],
       ],
     }],
@@ skipping 100 matching lines @@
               'dependencies': [
                 '../base/allocator/allocator.gyp:allocator',
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }