Massive refactor of the Android invalidation code.

components/invalidation/android/javatests/src/org/chromium/components/invalidation/TestableInvalidationClientService.java

Index: components/invalidation/android/javatests/src/org/chromium/components/invalidation/TestableInvalidationClientService.java
diff --git a/sync/android/javatests/src/org/chromium/sync/notifier/TestableInvalidationService.java b/components/invalidation/android/javatests/src/org/chromium/components/invalidation/TestableInvalidationClientService.java
similarity index 93%
rename from sync/android/javatests/src/org/chromium/sync/notifier/TestableInvalidationService.java
rename to components/invalidation/android/javatests/src/org/chromium/components/invalidation/TestableInvalidationClientService.java
index dd4a9320449654636e407ac2ecd3a29f44e64a40..d52390a5d875e64091153fdeefb54b6065b36c79 100644
--- a/sync/android/javatests/src/org/chromium/sync/notifier/TestableInvalidationService.java
+++ b/components/invalidation/android/javatests/src/org/chromium/components/invalidation/TestableInvalidationClientService.java
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.sync.notifier;
+package org.chromium.components.invalidation;
 
 import android.accounts.Account;
 import android.content.ComponentName;
@@ -19,12 +19,12 @@ import java.util.List;
 import java.util.Set;
 
 /**
- * Subclass of {@link InvalidationService} that captures events and allows controlling
+ * Subclass of {@link InvalidationClientService} that captures events and allows controlling
  * whether or not Chrome is in the foreground and sync is enabled.
  *
  * @author dsmyers@google.com (Daniel Myers)
  */
-public class TestableInvalidationService extends InvalidationService {
+public class TestableInvalidationClientService extends InvalidationClientService {
     /** Object ids given to {@link #register}, one list element per call. */
     final List<List<ObjectId>> mRegistrations = new ArrayList<List<ObjectId>>();
 
@@ -51,9 +51,6 @@ public class TestableInvalidationService extends InvalidationService {
     /** Whether sync is enabled. */
     private boolean mIsSyncEnabled = false;
 
-    public TestableInvalidationService() {
-    }
-
     @Override
     public void acknowledge(byte[] ackHandle) {
         mAcknowledgements.add(ackHandle);