Massive refactor of the Android invalidation code.

chrome/android/shell/java/AndroidManifest.xml

Index: chrome/android/shell/java/AndroidManifest.xml
diff --git a/chrome/android/shell/java/AndroidManifest.xml b/chrome/android/shell/java/AndroidManifest.xml
index 84ca1957cb4701431ac2831bfa9efab1bf5918c8..33256bac61de9194674c855559ce79e10db817a5 100644
--- a/chrome/android/shell/java/AndroidManifest.xml
+++ b/chrome/android/shell/java/AndroidManifest.xml
@@ -176,8 +176,8 @@
 
         <!-- 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"/>

[nyquist, 2014/09/04 18:16:32]

FYI: Since you have to do this here, you will have to do something similar
downstream. So this will break downstream builds (runtime?) whenever this rolls
in.

[maxbogue, 2014/09/05 16:42:45]

Acknowledged.

+        <service android:name="org.chromium.components.invalidation.InvalidationClientService"
                  android:exported="false">
             <intent-filter>
                 <action android:name="com.google.ipc.invalidation.AUTH_TOKEN_REQUEST"/>