| 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 733b3dde60a46b02dad39731329270d18e18360b..b63a6c749ea981d52468c92e0444feb180025b23 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 | 
| @@ -26,8 +26,8 @@ import java.util.Random; | 
| */ | 
| @JNINamespace("instance_id") | 
| public class FakeInstanceIDWithSubtype extends InstanceIDWithSubtype { | 
| -    private String mId = null; | 
| -    private long mCreationTime = 0; | 
| +    private String mId; | 
| +    private long mCreationTime; | 
|  | 
| /** Map from (subtype + ',' + authorizedEntity + ',' + scope) to token. */ | 
| private Map<String, String> mTokens = new HashMap<>(); | 
|  |