| Index: content/browser/loader/resource_loader.h
|
| diff --git a/content/browser/loader/resource_loader.h b/content/browser/loader/resource_loader.h
|
| index 21f800e496614f3311fd971fdd4800270b7a7bdd..03e65655fe56e2f4c92efdbd17e2c417ae2915c5 100644
|
| --- a/content/browser/loader/resource_loader.h
|
| +++ b/content/browser/loader/resource_loader.h
|
| @@ -15,6 +15,10 @@
|
| #include "content/public/common/signed_certificate_timestamp_id_and_status.h"
|
| #include "net/url_request/url_request.h"
|
|
|
| +namespace net {
|
| +class X509Certificate;
|
| +}
|
| +
|
| namespace content {
|
| class ResourceDispatcherHostLoginDelegate;
|
| class ResourceLoaderDelegate;
|
| @@ -46,7 +50,6 @@ class CONTENT_EXPORT ResourceLoader : public net::URLRequest::Delegate,
|
| ResourceRequestInfoImpl* GetRequestInfo();
|
|
|
| void ClearLoginDelegate();
|
| - void ClearSSLClientAuthHandler();
|
|
|
| // IPC message handlers:
|
| void OnUploadProgressACK();
|
| @@ -103,6 +106,7 @@ class CONTENT_EXPORT ResourceLoader : public net::URLRequest::Delegate,
|
| void ResponseCompleted();
|
| void CallDidFinishLoading();
|
| void RecordHistograms();
|
| + void ContinueWithCertificate(net::X509Certificate* cert);
|
|
|
| bool is_deferred() const { return deferred_stage_ != DEFERRED_NONE; }
|
|
|
| @@ -133,7 +137,7 @@ class CONTENT_EXPORT ResourceLoader : public net::URLRequest::Delegate,
|
| ResourceLoaderDelegate* delegate_;
|
|
|
| scoped_refptr<ResourceDispatcherHostLoginDelegate> login_delegate_;
|
| - scoped_refptr<SSLClientAuthHandler> ssl_client_auth_handler_;
|
| + scoped_ptr<SSLClientAuthHandler> ssl_client_auth_handler_;
|
|
|
| uint64 last_upload_position_;
|
| bool waiting_for_upload_progress_ack_;
|
|
|