Initial work to move downloads to ContentIds

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

Index: chrome/android/java/src/org/chromium/chrome/browser/download/DownloadInfo.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadInfo.java b/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadInfo.java
index 0e2be2ddc89effe91dba949a43b1784a1fad958e..badc4739c177761a91b9d7ea9cf1055d10c3964a 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadInfo.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadInfo.java
@@ -5,6 +5,8 @@
 package org.chromium.chrome.browser.download;
 
 import org.chromium.base.annotations.CalledByNative;
+import org.chromium.components.offline_items_collection.ContentId;
+import org.chromium.components.offline_items_collection.LegacyHelpers;
 import org.chromium.content_public.browser.DownloadState;
 
 /**
@@ -33,6 +35,7 @@ public final class DownloadInfo {
     private final boolean mIsOfflinePage;
     private final int mState;
     private final long mLastAccessTime;
+    private final ContentId mContentId;
 
     private DownloadInfo(Builder builder) {
         mUrl = builder.mUrl;
@@ -57,6 +60,11 @@ public final class DownloadInfo {
         mIsOfflinePage = builder.mIsOfflinePage;
         mState = builder.mState;
         mLastAccessTime = builder.mLastAccessTime;
+        if (builder.mContentId != null) {
+            mContentId = builder.mContentId;
+        } else {
+            mContentId = LegacyHelpers.buildLegacyContentId(mIsOfflinePage, mDownloadGuid);
+        }
     }
 
     public String getUrl() {
@@ -153,6 +161,10 @@ public final class DownloadInfo {
         return mLastAccessTime;
     }
 
+    public ContentId getContentId() {
+        return mContentId;
+    }
+
     /**
      * Helper class for building the DownloadInfo object.
      */
@@ -179,6 +191,7 @@ public final class DownloadInfo {
         private boolean mIsOfflinePage;
         private int mState = DownloadState.IN_PROGRESS;
         private long mLastAccessTime;
+        private ContentId mContentId;
 
         public Builder setUrl(String url) {
             mUrl = url;
@@ -291,6 +304,11 @@ public final class DownloadInfo {
             return this;
         }
 
+        public Builder setContentId(ContentId contentId) {
+            mContentId = contentId;
+            return this;
+        }
+
         public DownloadInfo build() {
             return new DownloadInfo(this);
         }