Fix handling of user and CA certificates on Android.

content/browser/renderer_host/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/renderer_host/buffered_resource_handler.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 275 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 defined(OS_ANDROID)
+  if (mime_type == "application/x-x509-user-cert" ||
+      mime_type == "application/x-x509-ca-cert" ||
+      mime_type == "application/x-pkcs12") {
+#else
   if (mime_type == "application/x-x509-user-cert") {
+#endif
     // Install X509 handler.
     scoped_ptr<ResourceHandler> handler(
         new X509UserCertResourceHandler(request_,
                                         info->GetChildID(),
                                         info->GetRouteID()));
     return UseAlternateNextHandler(handler.Pass());
   }
 
   if (!info->allow_download())
     return true;
@@ skipping 136 matching lines @@
     const std::vector<webkit::WebPluginInfo>& plugins) {
   bool defer = false;
   if (!ProcessResponse(&defer)) {
     controller()->Cancel();
   } else if (!defer) {
     controller()->Resume();
   }
 }
 
 }  // namespace content