Fix invalidations after ChromeInvalidationClientService introduction.

chrome/android/java/src/org/chromium/chrome/browser/invalidation/InvalidationController.java

Index: chrome/android/java/src/org/chromium/chrome/browser/invalidation/InvalidationController.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/invalidation/InvalidationController.java b/chrome/android/java/src/org/chromium/chrome/browser/invalidation/InvalidationController.java
index 66e2db1f6ca21bfe80d538efd33026c2257e6147..2f643221aecdb9004d319e6c381ddec0770efc37 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/invalidation/InvalidationController.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/invalidation/InvalidationController.java
@@ -191,7 +191,8 @@ public class InvalidationController implements ApplicationStatus.ApplicationStat
         Intent registerIntent = InvalidationIntentProtocol.createRegisterIntent(
                 ChromeSigninController.get(mContext).getSignedInUser(),
                 typesToRegister);
-        registerIntent.setClass(mContext, InvalidationClientService.class);
+        registerIntent.setClass(
+                mContext, InvalidationClientService.getRegisteredClass());
         mContext.startService(registerIntent);
     }
 
@@ -221,7 +222,8 @@ public class InvalidationController implements ApplicationStatus.ApplicationStat
     private void start() {
         mStarted = true;
         mEnableSessionInvalidationsTimer.resume();
-        Intent intent = new Intent(mContext, InvalidationClientService.class);
+        Intent intent = new Intent(
+                mContext, InvalidationClientService.getRegisteredClass());
         mContext.startService(intent);
     }
 
@@ -231,7 +233,8 @@ public class InvalidationController implements ApplicationStatus.ApplicationStat
     public void stop() {
         mStarted = false;
         mEnableSessionInvalidationsTimer.pause();
-        Intent intent = new Intent(mContext, InvalidationClientService.class);
+        Intent intent = new Intent(
+                mContext, InvalidationClientService.getRegisteredClass());
         intent.putExtra(InvalidationIntentProtocol.EXTRA_STOP, true);
         mContext.startService(intent);
     }