| 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 c8d67b5dc21bdc64b43c738a4ef8e25b6da2e3e9..a6930870a4bc4618c3195d43746f388afe65ff78 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
|
| @@ -16,7 +16,6 @@ import java.util.List;
|
| * Also has static methods serialize Cookies.
|
| */
|
| class CanonicalCookie {
|
| - private final String mUrl;
|
| private final String mName;
|
| private final String mValue;
|
| private final String mDomain;
|
| @@ -30,10 +29,9 @@ class CanonicalCookie {
|
| 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,
|
| - int sameSite, int priority) {
|
| - mUrl = url;
|
| + CanonicalCookie(String name, String value, String domain, String path, long creation,
|
| + long expiration, long lastAccess, boolean secure, boolean httpOnly, int sameSite,
|
| + int priority) {
|
| mName = name;
|
| mValue = value;
|
| mDomain = domain;
|
| @@ -92,11 +90,6 @@ class CanonicalCookie {
|
| return mPath;
|
| }
|
|
|
| - /** @return Cookie URL. */
|
| - String getUrl() {
|
| - return mUrl;
|
| - }
|
| -
|
| /** @return Cookie domain. */
|
| String getDomain() {
|
| return mDomain;
|
| @@ -164,7 +157,8 @@ class CanonicalCookie {
|
| }
|
|
|
| private void saveToStream(DataOutputStream out) throws IOException {
|
| - out.writeUTF(mUrl);
|
| + // URL is no longer included. Keep for backward compatability.
|
| + out.writeUTF("");
|
| out.writeUTF(mName);
|
| out.writeUTF(mValue);
|
| out.writeUTF(mDomain);
|
| @@ -179,8 +173,10 @@ class CanonicalCookie {
|
| }
|
|
|
| private static CanonicalCookie createFromStream(DataInputStream in) throws IOException {
|
| + // URL is no longer included. Keep for backward compatability.
|
| + in.readUTF();
|
| return new CanonicalCookie(in.readUTF(), in.readUTF(), in.readUTF(), in.readUTF(),
|
| - in.readUTF(), in.readLong(), in.readLong(), in.readLong(), in.readBoolean(),
|
| - in.readBoolean(), in.readInt(), in.readInt());
|
| + in.readLong(), in.readLong(), in.readLong(), in.readBoolean(), in.readBoolean(),
|
| + in.readInt(), in.readInt());
|
| }
|
| }
|
|
|