Make Web Push use InstanceID tokens instead of GCM registrations

components/gcm_driver/instance_id/android/javatests/src/org/chromium/components/gcm_driver/instance_id/FakeInstanceIDWithSubtype.java

Index: components/gcm_driver/instance_id/android/javatests/src/org/chromium/components/gcm_driver/instance_id/FakeInstanceIDWithSubtype.java
diff --git a/components/gcm_driver/instance_id/android/javatests/src/org/chromium/components/gcm_driver/instance_id/FakeInstanceIDWithSubtype.java b/components/gcm_driver/instance_id/android/javatests/src/org/chromium/components/gcm_driver/instance_id/FakeInstanceIDWithSubtype.java
index adb69823443786366718ac14b0c38678bfc7c6d9..90069e6e6865aac7bd839f8325a95b2c3916f9c8 100644
--- a/components/gcm_driver/instance_id/android/javatests/src/org/chromium/components/gcm_driver/instance_id/FakeInstanceIDWithSubtype.java
+++ b/components/gcm_driver/instance_id/android/javatests/src/org/chromium/components/gcm_driver/instance_id/FakeInstanceIDWithSubtype.java
@@ -10,6 +10,7 @@ import android.os.Looper;
 
 import com.google.android.gms.iid.InstanceID;
 
+import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
 
@@ -27,7 +28,10 @@ import java.util.Random;
 public class FakeInstanceIDWithSubtype extends InstanceIDWithSubtype {
     private String mId = null;
     private long mCreationTime = 0;
-    private Map<String, String> mTokens = new HashMap<>();
+
+    /** Map from (subtype + ',' + authorizedEntity + ',' + scope) to token. */
+    @VisibleForTesting
+    public Map<String, String> mTokens = new HashMap<>();
 
     /**
      * Enable this in all InstanceID tests to use this fake instead of hitting the network/disk.