Fix bug for resuming offline downloads.

There was a bug where resuming an offline page download while offline
was making it impossible to pause the download again. This CL fixes it.

Bug: 773759
Change-Id: I66f6f1bda50a2afa3bacf7329421780da7cd7128
Reviewed-on: https://chromium-review.googlesource.com/717142
Reviewed-by: David Trainor <dtrainor@chromium.org>
Commit-Queue: Joy Ming <jming@chromium.org>
Cr-Commit-Position: refs/heads/master@{#508494}

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

@@ -137,6 +137,16 @@ void updateNotification(Intent intent) {
                 break;
 
             case ACTION_DOWNLOAD_RESUME:
+                // If user manually resumes a download, update the network type if it
+                // is not metered previously.
+                boolean canDownloadWhileMetered = entry.canDownloadWhileMetered
+                        || DownloadManagerService.isActiveNetworkMetered(mApplicationContext);
+                // Update the SharedPreference entry.
+                mDownloadSharedPreferenceHelper.addOrReplaceSharedPreferenceEntry(
+                        new DownloadSharedPreferenceEntry(entry.id, entry.notificationId,
+                                entry.isOffTheRecord, canDownloadWhileMetered, entry.fileName, true,
+                                entry.isTransient));
+
                 mDownloadNotificationService.notifyDownloadPending(entry.id, entry.fileName,
                         entry.isOffTheRecord, entry.canDownloadWhileMetered, entry.isTransient,
                         null, true);
@@ -207,6 +217,7 @@ void propagateInteraction(Intent intent) {
 
         Preconditions.checkNotNull(downloadServiceDelegate);
         Preconditions.checkNotNull(id);
+        Preconditions.checkNotNull(entry);
 
         // Handle all remaining actions.
         switch (action) {
@@ -219,13 +230,8 @@ void propagateInteraction(Intent intent) {
                 break;
 
             case ACTION_DOWNLOAD_RESUME:
-                DownloadInfo info = new DownloadInfo.Builder()
-                                            .setDownloadGuid(id.id)
-                                            .setIsOffTheRecord(isOffTheRecord)
-                                            .build();
-
                 downloadServiceDelegate.resumeDownload(
-                        id, new DownloadItem(false, info), true /* hasUserGesture */);
+                        id, entry.buildDownloadItem(), true /* hasUserGesture */);
                 break;
 
             default:

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

@@ -228,7 +228,7 @@ private void updateActiveDownloadNotification(ContentId id, String fileName, Pro
         updateNotification(notificationId, notification, id,
                 new DownloadSharedPreferenceEntry(id, notificationId, isOffTheRecord,
                         canDownloadWhileMetered, fileName, true, isTransient));
-        // TODO(jming): do we want to handle the pending option in a different manner?
+
         mDownloadForegroundServiceManager.updateDownloadStatus(context,
                 DownloadForegroundServiceManager.DownloadStatus.IN_PROGRESS, notificationId,
                 notification);