Handle null payload when processing an invalidation on Android.

components/invalidation/impl/android/java/src/org/chromium/components/invalidation/PendingInvalidation.java

Index: components/invalidation/impl/android/java/src/org/chromium/components/invalidation/PendingInvalidation.java
diff --git a/components/invalidation/impl/android/java/src/org/chromium/components/invalidation/PendingInvalidation.java b/components/invalidation/impl/android/java/src/org/chromium/components/invalidation/PendingInvalidation.java
index c9a2fd1248a5448c0559a54811f6d4b148140338..deee2e3b9768c0f2ebfe3ce5feefb8bd470f91fc 100644
--- a/components/invalidation/impl/android/java/src/org/chromium/components/invalidation/PendingInvalidation.java
+++ b/components/invalidation/impl/android/java/src/org/chromium/components/invalidation/PendingInvalidation.java
@@ -122,16 +122,28 @@ public class PendingInvalidation {
         if (!(other instanceof PendingInvalidation)) return false;
         PendingInvalidation otherInvalidation = (PendingInvalidation) other;
         if (mObjectSource != otherInvalidation.mObjectSource) return false;
-        if (mObjectSource == 0) return true;
-        if (!mObjectId.equals(otherInvalidation.mObjectId)) return false;
-        if (!mPayload.equals(otherInvalidation.mPayload)) return false;
-        return mVersion == otherInvalidation.mVersion;
+        if (mObjectId == null) {
+            if (otherInvalidation.mObjectId != null) return false;
+        } else {
+            if (!mObjectId.equals(otherInvalidation.mObjectId)) return false;
+        }
+        if (mVersion != otherInvalidation.mVersion) return false;
+        if (mPayload == null) {
+            if (otherInvalidation.mPayload != null) return false;
+        } else {
+            if (!mPayload.equals(otherInvalidation.mPayload)) return false;
+        }
+        return true;
     }
 
     @Override
     public int hashCode() {

[nyquist, 2016/04/04 19:05:24]

Does changing the hashCode() have any horrible implications on previously stored
invalidations? Or will this problem just magically go away over time?

-        return mObjectId == null ? mObjectSource : mObjectSource ^ mObjectId.hashCode()
-                        ^ Long.valueOf(mVersion).hashCode();
+        int hashCode = 0;
+        if (mObjectId != null) hashCode ^= mObjectId.hashCode();
+        hashCode ^= mObjectSource;
+        hashCode ^= Long.valueOf(mVersion).hashCode();
+        if (mPayload != null) hashCode ^= mPayload.hashCode();
+        return hashCode;
     }
 
     @Override