android: Fix CanonicalCookie same_site field

chrome/android/java/src/org/chromium/chrome/browser/cookies/CanonicalCookie.java

Index: chrome/android/java/src/org/chromium/chrome/browser/cookies/CanonicalCookie.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/cookies/CanonicalCookie.java b/chrome/android/java/src/org/chromium/chrome/browser/cookies/CanonicalCookie.java
index eead2a8143cd2a0b0c936f61b537e87c74846f5f..2c51f7b709f64eb804cddef5d84cfde7e8224406 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/cookies/CanonicalCookie.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/cookies/CanonicalCookie.java
@@ -22,13 +22,13 @@ class CanonicalCookie {
     private final long mLastAccess;
     private final boolean mSecure;
     private final boolean mHttpOnly;
-    private final boolean mSameSite;
+    private final int mSameSite;
     private final int mPriority;
 
     /** Constructs a CanonicalCookie */
     CanonicalCookie(String url, String name, String value, String domain, String path,
             long creation, long expiration, long lastAccess, boolean secure, boolean httpOnly,
-            boolean sameSite, int priority) {
+            int sameSite, int priority) {
         mUrl = url;
         mName = name;
         mValue = value;
@@ -53,8 +53,8 @@ class CanonicalCookie {
         return mHttpOnly;
     }
 
-    /** @return True if the cookie is Same-Site. */
-    boolean isSameSite() {
+    /** @return SameSite enum */
+    int getSameSite() {
         return mSameSite;
     }
 
@@ -120,7 +120,7 @@ class CanonicalCookie {
         out.writeLong(mLastAccess);
         out.writeBoolean(mSecure);
         out.writeBoolean(mHttpOnly);
-        out.writeBoolean(mSameSite);
+        out.writeInt(mSameSite);

[boliu, 2016/04/18 20:50:22]

this should be safe since CookiesFetcher catches Throwable to make sure it
doesn't crash..?

[Yaron, 2016/04/19 14:36:13]

Confused why you're worried about the write - it's the read of the old boolean
as int which would be my concern. :)
Now you'd be trying to read 2 ints instead of a boolean & an int so the second
int will hit EOF. What's worse is that there's no separator between canonical
cookies so you'll actually start reading into the next canonical cookies's data
and you'd be off alignment and reading grabage :S

The safest thing may be to blow away the cookie store as a one-time operation
for this migration and add a version # to allow future upgrades to be seamless?

         out.writeInt(mPriority);
     }
 
@@ -134,6 +134,6 @@ class CanonicalCookie {
             throws IOException {
         return new CanonicalCookie(in.readUTF(), in.readUTF(), in.readUTF(), in.readUTF(),
                 in.readUTF(), in.readLong(), in.readLong(), in.readLong(), in.readBoolean(),
-                in.readBoolean(), in.readBoolean(), in.readInt());
+                in.readBoolean(), in.readInt(), in.readInt());
     }
 }