Massive refactor of the Android invalidation code.

chrome/android/javatests/src/org/chromium/chrome/browser/invalidation/IntentSavingContext.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/invalidation/IntentSavingContext.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/invalidation/IntentSavingContext.java b/chrome/android/javatests/src/org/chromium/chrome/browser/invalidation/IntentSavingContext.java
new file mode 100644
index 0000000000000000000000000000000000000000..ba04beb15033c1261b643e8e357a29fa81cfc53c
--- /dev/null
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/invalidation/IntentSavingContext.java
@@ -0,0 +1,45 @@
+// 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.
+
+package org.chromium.chrome.browser.invalidation;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+
+import org.chromium.base.test.util.AdvancedMockContext;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Mock context that saves all intents given to {@code startService}.
+ */
+public class IntentSavingContext extends AdvancedMockContext {
+    private final List<Intent> mStartedIntents = new ArrayList<Intent>();
+
+    IntentSavingContext(Context targetContext) {
+        super(targetContext);
+    }
+
+    @Override
+    public ComponentName startService(Intent intent) {
+        mStartedIntents.add(intent);
+        return new ComponentName(this, getClass());
+    }
+
+    int getNumStartedIntents() {
+        return mStartedIntents.size();
+    }
+
+    Intent getStartedIntent(int idx) {
+        return mStartedIntents.get(idx);
+    }
+
+    @Override
+    public PackageManager getPackageManager() {
+        return getBaseContext().getPackageManager();
+    }
+}