Massive refactor of the Android invalidation code.

chrome/android/sync_shell/java/AndroidManifest.xml

 <?xml version="1.0" encoding="utf-8"?>
 
 <!-- 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.
  -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.chromium.chrome.sync_shell">
@@ skipping 158 matching lines @@
             </intent-filter>
         </receiver>
         <service android:exported="false"
                  android:name="com.google.ipc.invalidation.external.client.contrib.MultiplexingGcmListener">
             <meta-data android:name="sender_ids"
                        android:value="cloudprint.c2dm@gmail.com,ipc.invalidation@gmail.com"/>
         </service>
 
         <!-- Notification service for sync. -->
         <meta-data android:name="ipc.invalidation.ticl.listener_service_class"
-                   android:value="org.chromium.sync.notifier.InvalidationService"/>
-        <service android:name="org.chromium.sync.notifier.InvalidationService"
+                   android:value="org.chromium.components.invalidation.InvalidationClientService"/>
+        <service android:name="org.chromium.components.invalidation.InvalidationClientService"
                  android:exported="false">
             <intent-filter>
                 <action android:name="com.google.ipc.invalidation.AUTH_TOKEN_REQUEST"/>
             </intent-filter>
         </service>
         <service android:exported="false"
                  android:name="com.google.ipc.invalidation.ticl.android2.TiclService"/>
         <service android:exported="false"
                  android:name="com.google.ipc.invalidation.ticl.android2.channel.AndroidMessageSenderService"/>
         <receiver android:exported="false"
@@ skipping 40 matching lines @@
         <receiver android:name="org.chromium.chrome.shell.signin.AccountsChangedReceiver">
             <intent-filter>
                 <action android:name="android.accounts.LOGIN_ACCOUNTS_CHANGED" />
             </intent-filter>
         </receiver>
         <meta-data android:name="org.chromium.content.browser.SMART_CLIP_PROVIDER"
                    android:value="org.chromium.content.browser.SmartClipProvider" />
 
     </application>
 </manifest>