Remove the GUID requirement from the ContentId

chrome/android/java/src/org/chromium/chrome/browser/download/DownloadSharedPreferenceEntry.java

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.download;
 
 import android.text.TextUtils;
 
 import org.chromium.base.Log;
 import org.chromium.base.VisibleForTesting;
@@ skipping 247 matching lines @@
         if (!isValidGUID(stringGuid)) return INVALID_ENTRY;
         if (TextUtils.isEmpty(stringNamespace)) return INVALID_ENTRY;
 
         return new DownloadSharedPreferenceEntry(new ContentId(stringNamespace, stringGuid),
                 notificationId, offTheRecord, metered, stringFileName, autoResume, false);
     }
 
     static DownloadSharedPreferenceEntry parseFromVersion6(String string) {
         String[] entries = string.split(",", 9);
         if (entries.length != 9) return INVALID_ENTRY;
-        // VERSION,NOTIFICATIONID,NAMESPACE,GUID,OFFTHERECORD,METEREDOK,AUTORESUMEOK,ISTRANSIENT,
+        // VERSION,NOTIFICATIONID,NAMESPACE,ID,OFFTHERECORD,METEREDOK,AUTORESUMEOK,ISTRANSIENT,
         // FILENAME
         String stringVersion = entries[0];
         String stringNotificationId = entries[1];
         String stringNamespace = entries[2];
-        String stringGuid = entries[3];
+        String stringId = entries[3];
         String stringOffTheRecord = entries[4];
         String stringMetered = entries[5];
         String stringAutoResume = entries[6];
         String stringTransient = entries[7];
         String stringFileName = entries[8];
 
         boolean offTheRecord = "1".equals(stringOffTheRecord);
         boolean metered = "1".equals(stringMetered);
         boolean autoResume = "1".equals(stringAutoResume);
         boolean isTransient = "1".equals(stringTransient);
         int version;
         int notificationId;
         try {
             version = Integer.parseInt(stringVersion);
             notificationId = Integer.parseInt(stringNotificationId);
         } catch (NumberFormatException ex) {
             return INVALID_ENTRY;
         }
 
         if (version != 6) return INVALID_ENTRY;
-        if (!isValidGUID(stringGuid)) return INVALID_ENTRY;
+        if (TextUtils.isEmpty(stringId)) return INVALID_ENTRY;
         if (TextUtils.isEmpty(stringNamespace)) return INVALID_ENTRY;
 
-        return new DownloadSharedPreferenceEntry(new ContentId(stringNamespace, stringGuid),
+        return new DownloadSharedPreferenceEntry(new ContentId(stringNamespace, stringId),
                 notificationId, offTheRecord, metered, stringFileName, autoResume, isTransient);
     }
 
     /**
      * @return a string for the DownloadSharedPreferenceEntry instance to be inserted into
      *         SharedPrefs.
      */
     String getSharedPreferenceString() {
         String serialized = "";
         serialized += VERSION + ",";
@@ skipping 63 matching lines @@
         hash = 37 * hash + (isOffTheRecord ? 1 : 0);
         hash = 37 * hash + (canDownloadWhileMetered ? 1 : 0);
         hash = 37 * hash + (isAutoResumable ? 1 : 0);
         hash = 37 * hash + notificationId;
         hash = 37 * hash + id.hashCode();
         hash = 37 * hash + fileName.hashCode();
         hash = 37 * hash + (isTransient ? 1 : 0);
         return hash;
     }
 }