Massive refactor of the Android invalidation code.

chrome/chrome_tests_unit.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.
 {
   'variables': {
     'chrome_unit_tests_sources': [
       '../apps/saved_devices_service_unittest.cc',
       '../apps/saved_files_service_unittest.cc',
       '../components/autofill/content/renderer/test_password_autofill_agent.cc',
       '../components/autofill/content/renderer/test_password_autofill_agent.h',
@@ skipping 468 matching lines @@
       'browser/internal_auth_unittest.cc',
       'browser/install_verification/win/imported_module_verification_unittest.cc',
       'browser/install_verification/win/loaded_module_verification_unittest.cc',
       'browser/install_verification/win/loaded_modules_snapshot_unittest.cc',
       'browser/install_verification/win/module_ids_unittest.cc',
       'browser/install_verification/win/module_info_unittest.cc',
       'browser/install_verification/win/module_list_unittest.cc',
       'browser/install_verification/win/module_verification_test.cc',
       'browser/install_verification/win/module_verification_test.h',
       'browser/invalidation/gcm_invalidation_bridge_unittest.cc',
-      'browser/invalidation/invalidation_service_android_unittest.cc',
       'browser/invalidation/invalidator_storage_unittest.cc',
       'browser/invalidation/ticl_profile_settings_provider_unittest.cc',
       'browser/io_thread_unittest.cc',
       'browser/logging_chrome_unittest.cc',
       'browser/mac/keystone_glue_unittest.mm',
       'browser/media/cast_transport_host_filter_unittest.cc',
       'browser/media/desktop_media_list_ash_unittest.cc',
       'browser/media/native_desktop_media_list_unittest.cc',
       'browser/media/webrtc_log_uploader_unittest.cc',
       'browser/media/webrtc_log_util_unittest.cc',
@@ skipping 2371 matching lines @@
               'dependencies': [
                 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
               ],
             }],
           ],
         },
       ],
     }],
   ],  # 'conditions'
 }