Initial work to move downloads to ContentIds

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

 // Copyright 2015 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.app.DownloadManager;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 
 import org.chromium.chrome.browser.util.IntentUtils;
+import org.chromium.components.offline_items_collection.ContentId;
 
 /**
  * This {@link BroadcastReceiver} handles clicks to download notifications and their action buttons.
  * Clicking on an in-progress or failed download will open the download manager. Clicking on
  * a complete, successful download will open the file. Clicking on the resume button of a paused
  * download will relaunch the browser process and try to resume the download from where it is
  * stopped.
  */
 public class DownloadBroadcastReceiver extends BroadcastReceiver {
     @Override
@@ skipping 34 matching lines @@
             DownloadManagerService.openDownloadsPage(context);
             return;
         }
 
         String downloadFilename = IntentUtils.safeGetStringExtra(
                 intent, DownloadNotificationService.EXTRA_DOWNLOAD_FILE_PATH);
         boolean isSupportedMimeType =  IntentUtils.safeGetBooleanExtra(
                 intent, DownloadNotificationService.EXTRA_IS_SUPPORTED_MIME_TYPE, false);
         boolean isOffTheRecord = IntentUtils.safeGetBooleanExtra(
                 intent, DownloadNotificationService.EXTRA_IS_OFF_THE_RECORD, false);
-        String downloadGuid = IntentUtils.safeGetStringExtra(
-                intent, DownloadNotificationService.EXTRA_DOWNLOAD_GUID);
+        ContentId contentId = DownloadNotificationService.getContentIdFromIntent(intent);
         DownloadManagerService.openDownloadedContent(
-                context, downloadFilename, isSupportedMimeType, isOffTheRecord, downloadGuid, id);
+                context, downloadFilename, isSupportedMimeType, isOffTheRecord, contentId.id, id);
     }
 
     /**
      * Called to perform a download operation. This will call the DownloadNotificationService
      * to start the browser process asynchronously, and resume or cancel the download afterwards.
      * @param context Context of the receiver.
      * @param intent Intent retrieved from the notification.
      */
     private void performDownloadOperation(final Context context, Intent intent) {
         if (DownloadNotificationService.isDownloadOperationIntent(intent)) {
             DownloadNotificationService.startDownloadNotificationService(context, intent);
         }
     }
 }