Index: content/browser/loader/mime_type_resource_handler.cc |
diff --git a/content/browser/loader/mime_type_resource_handler.cc b/content/browser/loader/mime_type_resource_handler.cc |
index 59c2b5310660487b1a0ccdc7f9591da7ebcc14bc..5d1672c593cc583f287520dd3078361108f4e867 100644 |
--- a/content/browser/loader/mime_type_resource_handler.cc |
+++ b/content/browser/loader/mime_type_resource_handler.cc |
@@ -341,6 +341,7 @@ bool MimeTypeResourceHandler::SelectNextHandler(bool* defer) { |
ResourceRequestInfoImpl* info = GetRequestInfo(); |
const std::string& mime_type = response_->head.mime_type; |
+#if defined(OS_ANDROID) |
if (mime_util::IsSupportedCertificateMimeType(mime_type)) { |
// Install certificate file. |
info->set_is_download(true); |
@@ -348,6 +349,7 @@ bool MimeTypeResourceHandler::SelectNextHandler(bool* defer) { |
new CertificateResourceHandler(request())); |
return UseAlternateNextHandler(handler.Pass(), std::string()); |
} |
+#endif |
// Allow requests for object/embed tags to be intercepted as streams. |
if (info->GetResourceType() == content::RESOURCE_TYPE_OBJECT) { |
@@ -371,8 +373,10 @@ bool MimeTypeResourceHandler::SelectNextHandler(bool* defer) { |
bool must_download = MustDownload(); |
if (!must_download) { |
- if (mime_util::IsSupportedMimeType(mime_type)) |
+ if (mime_util::IsSupportedMimeType(mime_type) && |
+ !mime_util::IsSupportedCertificateMimeType(mime_type)) { |
return true; |
+ } |
bool handled_by_plugin; |
if (!SelectPluginHandler(defer, &handled_by_plugin)) |