Remap MIME type when loading download items from history db

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

Index: chrome/android/java/src/org/chromium/chrome/browser/download/DownloadManagerService.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadManagerService.java b/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadManagerService.java
index 42aab0dc2b322b0a019647a027bb3af030ba4091..8a6c207784fa9ae4add20b26bfe481101b279138 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadManagerService.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadManagerService.java
@@ -1530,8 +1530,12 @@ public class DownloadManagerService extends BroadcastReceiver implements
     private void addDownloadItemToList(List<DownloadItem> list, String guid, String displayName,
             String filepath, String url, String mimeType, long startTimestamp, long totalBytes,
             boolean hasBeenExternallyRemoved) {
+        // Remap the MIME type first.
+        File file = new File(filepath);
+        String newMimeType =
+                ChromeDownloadDelegate.remapGenericMimeType(mimeType, url, file.getName());
         list.add(createDownloadItem(
-                guid, displayName, filepath, url, mimeType, startTimestamp, totalBytes,
+                guid, displayName, filepath, url, newMimeType, startTimestamp, totalBytes,
                 hasBeenExternallyRemoved));
     }