Massive refactor of the Android invalidation code.

components/components_tests.gyp

Index: components/components_tests.gyp
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index 76044be245bb0d4636fd7b4641e866396534e77e..0e4ad2d0856ab545203fae0a182d698cee6213bc 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -600,16 +600,19 @@
               ],
             }],
             ['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',
@@ -842,6 +845,7 @@
               'type': 'none',
               'dependencies': [
                 'components_unittests',
+                'components.gyp:invalidation_java',
               ],
               'variables': {
                 'test_suite_name': 'components_unittests',