Massive refactor of the Android invalidation code.

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.
 
 {
   'variables': {
     # All .cc, .h, .m, and .mm files under browser except for:
     # * tests and mocks.
     # * code below browser/chromeos
     # * code below browser/extensions
@@ skipping 565 matching lines @@
       'browser/install_verification/win/module_ids.h',
       'browser/install_verification/win/module_info.h',
       'browser/install_verification/win/module_list.cc',
       'browser/install_verification/win/module_list.h',
       'browser/install_verification/win/module_verification_common.cc',
       'browser/install_verification/win/module_verification_common.h',
       'browser/internal_auth.cc',
       'browser/internal_auth.h',
       'browser/intranet_redirect_detector.cc',
       'browser/intranet_redirect_detector.h',
-      'browser/invalidation/invalidation_controller_android.cc',
-      'browser/invalidation/invalidation_controller_android.h',
-      'browser/invalidation/invalidation_service_android.cc',
-      'browser/invalidation/invalidation_service_android.h',
+      'browser/invalidation/invalidation_service_factory_android.cc',
+      'browser/invalidation/invalidation_service_factory_android.h',
       'browser/invalidation/profile_invalidation_provider_factory.cc',
       'browser/invalidation/profile_invalidation_provider_factory.h',
       'browser/io_thread.cc',
       'browser/io_thread.h',
       'browser/jumplist_updater_win.cc',
       'browser/jumplist_updater_win.h',
       'browser/jumplist_win.cc',
       'browser/jumplist_win.h',
       'browser/lifetime/application_lifetime.cc',
       'browser/lifetime/application_lifetime.h',
@@ skipping 2158 matching lines @@
       'android/java/src/org/chromium/chrome/browser/UrlUtilities.java',
       'android/java/src/org/chromium/chrome/browser/VoiceSearchTabHelper.java',
       'android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java',
       'android/java/src/org/chromium/chrome/browser/infobar/AutoLoginDelegate.java',
       'android/java/src/org/chromium/chrome/browser/infobar/ConfirmInfoBarDelegate.java',
       'android/java/src/org/chromium/chrome/browser/infobar/DataReductionProxyInfoBarDelegate.java',
       'android/java/src/org/chromium/chrome/browser/infobar/InfoBar.java',
       'android/java/src/org/chromium/chrome/browser/infobar/InfoBarContainer.java',
       'android/java/src/org/chromium/chrome/browser/infobar/SavePasswordInfoBarDelegate.java',
       'android/java/src/org/chromium/chrome/browser/infobar/TranslateInfoBarDelegate.java',
-      'android/java/src/org/chromium/chrome/browser/invalidation/InvalidationController.java',
+      'android/java/src/org/chromium/chrome/browser/invalidation/InvalidationServiceFactory.java',
       'android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModel.java'
     ],
   },
   'targets': [
     {
       'target_name': 'browser',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
       'dependencies': [
         # NOTE: New dependencies should generally be added in the OS!="ios"
@@ skipping 812 matching lines @@
           'variables': {
             'proto_in_dir': 'browser/sync_file_system/drive_backend',
             'proto_out_dir': 'chrome/browser/sync_file_system/drive_backend',
           },
           'includes': [ '../build/protoc.gypi' ]
         },
       ],
     },],
   ],
 }