Fix certificate and keychain installation on Android.

content/browser/loader/buffered_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/buffered_resource_handler.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "content/browser/download/download_resource_handler.h"
 #include "content/browser/download/download_stats.h"
+#include "content/browser/loader/certificate_resource_handler.h"
 #include "content/browser/loader/resource_dispatcher_host_impl.h"
 #include "content/browser/loader/resource_request_info_impl.h"
-#include "content/browser/loader/x509_user_cert_resource_handler.h"
 #include "content/browser/plugin_service_impl.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/download_save_info.h"
 #include "content/public/browser/resource_context.h"
 #include "content/public/browser/resource_dispatcher_host_delegate.h"
 #include "content/public/common/resource_response.h"
 #include "net/base/io_buffer.h"
 #include "net/base/mime_sniffer.h"
 #include "net/base/mime_util.h"
@@ skipping 268 matching lines @@
 
   return made_final_decision;
 }
 
 bool BufferedResourceHandler::SelectNextHandler(bool* defer) {
   DCHECK(!response_->head.mime_type.empty());
 
   ResourceRequestInfoImpl* info = ResourceRequestInfoImpl::ForRequest(request_);
   const std::string& mime_type = response_->head.mime_type;
 
-  if (mime_type == "application/x-x509-user-cert") {
-    // Install X509 handler.
+  if (net::IsSupportedCertificateMimeType(mime_type)) {
+    // Install certificate file.
     scoped_ptr<ResourceHandler> handler(
-        new X509UserCertResourceHandler(request_,
-                                        info->GetChildID(),
-                                        info->GetRouteID()));
+        new CertificateResourceHandler(request_,
+                                       info->GetChildID(),
+                                       info->GetRouteID()));
     return UseAlternateNextHandler(handler.Pass());
   }
 
   if (!info->allow_download())
     return true;
 
   if (!MustDownload()) {
     if (net::IsSupportedMimeType(mime_type))
       return true;
 
@@ skipping 131 matching lines @@
     const std::vector<webkit::WebPluginInfo>& plugins) {
   bool defer = false;
   if (!ProcessResponse(&defer)) {
     controller()->Cancel();
   } else if (!defer) {
     controller()->Resume();
   }
 }
 
 }  // namespace content