Make Web Push use InstanceID tokens instead of GCM registrations

components/gcm_driver/android/java/src/org/chromium/components/gcm_driver/FakeGoogleCloudMessagingSubscriber.java

Index: components/gcm_driver/android/java/src/org/chromium/components/gcm_driver/FakeGoogleCloudMessagingSubscriber.java
diff --git a/components/gcm_driver/android/java/src/org/chromium/components/gcm_driver/FakeGoogleCloudMessagingSubscriber.java b/components/gcm_driver/android/java/src/org/chromium/components/gcm_driver/FakeGoogleCloudMessagingSubscriber.java
deleted file mode 100644
index 8085b4bc983c958d6c92d5fca52f7975e838f76a..0000000000000000000000000000000000000000
--- a/components/gcm_driver/android/java/src/org/chromium/components/gcm_driver/FakeGoogleCloudMessagingSubscriber.java
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright 2015 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.components.gcm_driver;
-
-import android.os.Bundle;
-
-import org.chromium.base.VisibleForTesting;
-
-import java.io.IOException;
-
-import javax.annotation.Nullable;
-
-/**
- * A fake subscriber for test purposes.
- */
-public class FakeGoogleCloudMessagingSubscriber implements GoogleCloudMessagingSubscriber {

[Peter Beverloo, 2016/04/21 13:26:18]

We are basically losing the only user of GCMDriverAndroid::{Register,
UnregisterWithSenderId} now, right? Do we have sufficient test coverage left of
that functionality?

[johnme, 2016/05/25 14:11:50]

I re-added UnregisterWithSenderId during my backwards compatibility analysis (we
use it when unsubscribing legacy registrations).

As for GCMDriverAndroid::Register, it is indeed unused and untested now. We'll
probably start using it again once we fix https://crbug.com/600286 (unless we
start auto-expiring registrations once per week, but that seems unlikely).

-    private static final String FAKE_REGISTRATION_ID = "FAKE_REGISTRATION_ID";
-    private String mLastSubscribeSource;
-    private String mLastSubscribeSubtype;
-
-    @Override
-    public String subscribe(String source, String subtype, @Nullable Bundle data)
-            throws IOException {
-        mLastSubscribeSource = source;
-        mLastSubscribeSubtype = subtype;
-        return FAKE_REGISTRATION_ID;
-    }
-
-    @Override
-    public void unsubscribe(String source, String subtype, @Nullable Bundle data)
-            throws IOException {
-        // No need to do anything here yet.
-    }
-
-    /**
-     * The source (sender id) passed to #subscribe the last time it was called, or null if it was
-     * never called.
-     */
-    @Nullable
-    @VisibleForTesting
-    public String getLastSubscribeSource() {
-        return mLastSubscribeSource;
-    }
-
-    /**
-     * The subtype (app id) passed to #subscribe the last time it was called, or null if it was
-     * never called.
-     */
-    @Nullable
-    @VisibleForTesting
-    public String getLastSubscribeSubtype() {
-        return mLastSubscribeSubtype;
-    }
-}