components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDWithSubtype.java - Issue 1851423003: Make Web Push use InstanceID tokens instead of GCM registrations

Unified Diff: components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDWithSubtype.java

Issue 1851423003: Make Web Push use InstanceID tokens instead of GCM registrations (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@iid4default

Patch Set: Address review comments, and rewrite following rebase (e.g. no longer depends on NestedMessagePumpA… Created 4 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« components/gcm_driver/android/java/src/org/chromium/components/gcm_driver/FakeGoogleCloudMessagingSubscriber.java ('K') | « components/gcm_driver/fake_gcm_driver.h ('k') | components/gcm_driver/instance_id/android/javatests/src/org/chromium/components/gcm_driver/instance_id/FakeInstanceIDWithSubtype.java » ('j') | components/gcm_driver/instance_id/fake_gcm_driver_for_instance_id.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDWithSubtype.java

diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDWithSubtype.java b/components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDWithSubtype.java

index bf5ec63a1bdd951a802680eac593d90fc6cb1f50..5ec9c0c6a49d65e832eb8439e46722f07caa787a 100644

--- a/components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDWithSubtype.java

+++ b/components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDWithSubtype.java

@@ -24,7 +24,7 @@ public class InstanceIDWithSubtype extends InstanceID {

/** Cached instances. May be accessed from multiple threads; synchronize on InstanceID.class. */

@VisibleForTesting

- protected static Map<String, InstanceIDWithSubtype> sSubtypeInstances = new HashMap<>();

+ public static Map<String, InstanceIDWithSubtype> sSubtypeInstances = new HashMap<>();

Peter Beverloo 2016/04/21 13:26:19 Have you considered adding a public (for testing)

johnme 2016/05/25 14:11:51 Done.

/** Fake subclasses can set this so getInstance creates instances of them. */

@VisibleForTesting