Removing x-x509-user-cert mime handler.

content/browser/loader/mime_type_resource_handler.cc

 // Copyright (c) 2012 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.
 
 #include "content/browser/loader/mime_type_resource_handler.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 323 matching lines @@
 #endif
   return true;
 }
 
 bool MimeTypeResourceHandler::SelectNextHandler(bool* defer) {
   DCHECK(!response_->head.mime_type.empty());
 
   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);
     scoped_ptr<ResourceHandler> handler(
         new CertificateResourceHandler(request()));
     return UseAlternateNextHandler(handler.Pass(), std::string());
   }
+#endif

[Ryan Sleevi, 2015/10/30 23:33:47]

We should be able to delete this code; the intent should fire for the mime type,
AIUI - meaning we just treat it as a file download and let the inbuilt intent
handle it.

[svaldez, 2015/11/02 16:27:38]

Acknowledged.

 
   // Allow requests for object/embed tags to be intercepted as streams.
   if (info->GetResourceType() == content::RESOURCE_TYPE_OBJECT) {
     DCHECK(!info->allow_download());
 
     bool handled_by_plugin;
     if (!SelectPluginHandler(defer, &handled_by_plugin))
       return false;
     if (handled_by_plugin || *defer)
       return true;
   }
 
   if (!info->allow_download())
     return true;
 
   // info->allow_download() == true implies
   // info->GetResourceType() == RESOURCE_TYPE_MAIN_FRAME or
   // info->GetResourceType() == RESOURCE_TYPE_SUB_FRAME.
   DCHECK(info->GetResourceType() == RESOURCE_TYPE_MAIN_FRAME ||
          info->GetResourceType() == RESOURCE_TYPE_SUB_FRAME);
 
   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))
       return false;
     if (handled_by_plugin || *defer)
       return true;
   }
 
   // Install download handler
   info->set_is_download(true);
@@ skipping 128 matching lines @@
   request()->LogUnblocked();
   bool defer = false;
   if (!ProcessResponse(&defer)) {
     controller()->Cancel();
   } else if (!defer) {
     controller()->Resume();
   }
 }
 
 }  // namespace content