Initial work to move downloads to ContentIds

chrome/android/java/src/org/chromium/chrome/browser/download/DownloadItem.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 org.chromium.base.annotations.CalledByNative;
+import org.chromium.components.offline_items_collection.ContentId;
 
 /**
  * A generic class representing a download item. The item can be either downloaded through the
  * Android DownloadManager, or through Chrome's network stack.
  *
  * This represents the native DownloadItem at a specific point in time -- the native side
  * DownloadManager must be queried for the correct status.
  */
 public class DownloadItem {
     public static final int INDETERMINATE_DOWNLOAD_PERCENTAGE = -1;
     static final long INVALID_DOWNLOAD_ID = -1L;
 
+    private final ContentId mContentId = new ContentId();
     private boolean mUseAndroidDownloadManager;
     private DownloadInfo mDownloadInfo;
     private long mDownloadId = INVALID_DOWNLOAD_ID;
     private long mStartTime;
     private boolean mHasBeenExternallyRemoved;
 
     public DownloadItem(boolean useAndroidDownloadManager, DownloadInfo info) {
         mUseAndroidDownloadManager = useAndroidDownloadManager;
         mDownloadInfo = info;
+        if (mDownloadInfo != null) mContentId.namespace = mDownloadInfo.getContentId().namespace;
+        mContentId.id = getId();
     }
 
     /**
      * Sets the system download ID retrieved from Android DownloadManager.
      *
      * @param downloadId ID from the Android DownloadManager.
      */
     public void setSystemDownloadId(long downloadId) {
         mDownloadId = downloadId;
+
+        // Update our ContentId in case it changed.
+        mContentId.id = getId();
     }
 
     /**
      * @return whether the download item has a valid system download ID.
      */
     public boolean hasSystemDownloadId() {
         return mDownloadId != INVALID_DOWNLOAD_ID;
     }
 
     /**
      * @return System download ID from the Android DownloadManager.
      */
     public long getSystemDownloadId() {
         return mDownloadId;
     }
 
     /**
+     * @return A {@link ContentId} that represents this downloaded item.  The id will match
+     *         {@link #getId()}.
+     */
+    public ContentId getContentId() {
+        return mContentId;
+    }
+
+    /**
      * @return String ID that uniquely identifies the download.
      */
     public String getId() {
         if (mUseAndroidDownloadManager) {
             return String.valueOf(mDownloadId);
         }
         return mDownloadInfo.getDownloadGuid();
     }
 
     /**
@@ skipping 59 matching lines @@
         return downloadItem;
     }
 
     /**
      * @return Whether or not the download has an indeterminate percentage.
      */
     public boolean isIndeterminate() {
         return getDownloadInfo().getPercentCompleted() == INDETERMINATE_DOWNLOAD_PERCENTAGE;
     }
 }