[Downloads] Various fixes

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

Index: chrome/android/java/src/org/chromium/chrome/browser/download/DownloadBroadcastReceiver.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadBroadcastReceiver.java b/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadBroadcastReceiver.java
index e561effc1da30055d06d162a88efabfe4478a043..e2ffdab4195536fb11cc3f01e819f563abfea69b 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadBroadcastReceiver.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadBroadcastReceiver.java
@@ -40,7 +40,7 @@ public class DownloadBroadcastReceiver extends BroadcastReceiver {
     }
 
     /**
-     * Called to open a given download item that is downloaded by the android DownloadManager.
+     * Called to open a particular download item.  Falls back to opening Download Home.
      * @param context Context of the receiver.
      * @param intent Intent from the android DownloadManager.
      */
@@ -51,24 +51,22 @@ public class DownloadBroadcastReceiver extends BroadcastReceiver {
             DownloadManagerService.openDownloadsPage(context);
             return;
         }
+
         long id = ids[0];
         DownloadManager manager =
                 (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE);
         Uri uri = manager.getUriForDownloadedFile(id);
         if (uri == null) {
-            // Open the downloads page
             DownloadManagerService.openDownloadsPage(context);
-        } else {
-            String downloadFilename = IntentUtils.safeGetStringExtra(
-                    intent, DownloadNotificationService.EXTRA_DOWNLOAD_FILE_PATH);
-            boolean isSupportedMimeType =  IntentUtils.safeGetBooleanExtra(
-                    intent, DownloadNotificationService.EXTRA_IS_SUPPORTED_MIME_TYPE, false);
-            Intent launchIntent = DownloadManagerService.getLaunchIntentFromDownloadId(
-                    context, downloadFilename, id, isSupportedMimeType);
-            if (!DownloadUtils.fireOpenIntentForDownload(context, launchIntent)) {
-                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);
+        DownloadManagerService.openDownloadedContent(
+                context, downloadFilename, isSupportedMimeType, id);
     }
 
     /**