Fix certificate and keychain installation on Android.

content/browser/renderer_host/certificate_resource_handler.h

 // 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.
 
-#ifndef CONTENT_BROWSER_RENDERER_HOST_X509_USER_CERT_RESOURCE_HANDLER_H_
-#define CONTENT_BROWSER_RENDERER_HOST_X509_USER_CERT_RESOURCE_HANDLER_H_
+#ifndef CONTENT_BROWSER_RENDERER_HOST_CRYPTO_FILE_RESOURCE_HANDLER_H_
+#define CONTENT_BROWSER_RENDERER_HOST_CRYPTO_FILE_RESOURCE_HANDLER_H_

[Ryan Sleevi, 2012/11/13 19:37:50]

nit: headers

 
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "content/browser/renderer_host/resource_handler.h"
 #include "googleurl/src/gurl.h"
+#include "net/base/mime_util.h"
 
 namespace net {
 class IOBuffer;
 class URLRequest;
 class URLRequestStatus;
 }  // namespace net
 
 namespace content {
 
-// This class handles the "application/x-x509-user-cert" mime-type
-// which is a certificate generated by a CA, typically after a previous
-// <keygen> form post.
+// This class handles the cryptographics mime-types supported by

[Ryan Sleevi, 2012/11/13 19:37:50]

nit: s/cryptographics/cryptographic/

+// net::IsSupportedCertificateMimeType(mime_type). These typically
+// corresponds to X509 User certificates, but also on some platforms, to
+// X509 CA certificates and PKCS#12 keychains.

[Ryan Sleevi, 2012/11/13 19:37:50]

nit: s/X509/X.509/ (throughout the CL)

[digit1, 2012/11/15 17:42:14]

Done.

+//
 
-class X509UserCertResourceHandler : public ResourceHandler {
+class CertificateResourceHandler : public ResourceHandler {
  public:
-  X509UserCertResourceHandler(net::URLRequest* request,
-                              int render_process_host_id,
-                              int render_view_id);
-  virtual ~X509UserCertResourceHandler();
+  CertificateResourceHandler(net::URLRequest* request,
+                            int render_process_host_id,
+                            int render_view_id);
+  virtual ~CertificateResourceHandler();
 
   virtual bool OnUploadProgress(int request_id,
                                 uint64 position,
                                 uint64 size) OVERRIDE;
 
   // Not needed, as this event handler ought to be the final resource.
   virtual bool OnRequestRedirected(int request_id,
                                    const GURL& url,
                                    ResourceResponse* resp,
                                    bool* defer) OVERRIDE;
@@ skipping 28 matching lines @@
   typedef std::vector<std::pair<scoped_refptr<net::IOBuffer>,
                                 size_t> > ContentVector;
 
   void AssembleResource();
 
   GURL url_;
   net::URLRequest* request_;
   size_t content_length_;
   ContentVector buffer_;
   scoped_refptr<net::IOBuffer> read_buffer_;
-  scoped_refptr<net::IOBuffer> resource_buffer_;  // Downloaded certificate.
+  scoped_refptr<net::IOBuffer> resource_buffer_;  // Downloaded file.
   // The id of the |RenderProcessHost| which started the download.
   int render_process_host_id_;
   // The id of the |RenderView| which started the download.
   int render_view_id_;
-
-  DISALLOW_COPY_AND_ASSIGN(X509UserCertResourceHandler);
+  net::CertificateType cert_type_;
+  DISALLOW_COPY_AND_ASSIGN(CertificateResourceHandler);
 };
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_RENDERER_HOST_X509_USER_CERT_RESOURCE_HANDLER_H_
+#endif  // CONTENT_BROWSER_RENDERER_HOST_CRYPTO_FILE_RESOURCE_HANDLER_H_