| Index: content/browser/loader/resource_loader.h
|
| diff --git a/content/browser/loader/resource_loader.h b/content/browser/loader/resource_loader.h
|
| index e4b6c96d395c0562dfe46f66a023b00afcc57bf6..9f243928142d4a988acf75c2d1a3751a12a5a8b6 100644
|
| --- a/content/browser/loader/resource_loader.h
|
| +++ b/content/browser/loader/resource_loader.h
|
| @@ -14,10 +14,6 @@
|
| #include "content/public/browser/resource_controller.h"
|
| #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;
|
| @@ -50,6 +46,7 @@
|
| ResourceRequestInfoImpl* GetRequestInfo();
|
|
|
| void ClearLoginDelegate();
|
| + void ClearSSLClientAuthHandler();
|
|
|
| // IPC message handlers:
|
| void OnUploadProgressACK();
|
| @@ -105,7 +102,6 @@
|
| void ResponseCompleted();
|
| void CallDidFinishLoading();
|
| void RecordHistograms();
|
| - void ContinueWithCertificate(net::X509Certificate* cert);
|
|
|
| bool is_deferred() const { return deferred_stage_ != DEFERRED_NONE; }
|
|
|
| @@ -136,7 +132,7 @@
|
| ResourceLoaderDelegate* delegate_;
|
|
|
| scoped_refptr<ResourceDispatcherHostLoginDelegate> login_delegate_;
|
| - scoped_ptr<SSLClientAuthHandler> ssl_client_auth_handler_;
|
| + scoped_refptr<SSLClientAuthHandler> ssl_client_auth_handler_;
|
|
|
| uint64 last_upload_position_;
|
| bool waiting_for_upload_progress_ack_;
|
|
|