Chromium Code Reviews| Index: content/browser/ssl/ssl_manager.cc |
| diff --git a/content/browser/ssl/ssl_manager.cc b/content/browser/ssl/ssl_manager.cc |
| index ee764be655383bb3cb95e11bad1c7e5f349791b3..4526ab3d13e622ed6a6437f776e42ec9eb153273 100644 |
| --- a/content/browser/ssl/ssl_manager.cc |
| +++ b/content/browser/ssl/ssl_manager.cc |
| @@ -15,7 +15,6 @@ |
| #include "content/browser/loader/resource_request_info_impl.h" |
| #include "content/browser/ssl/ssl_cert_error_handler.h" |
| #include "content/browser/ssl/ssl_policy.h" |
| -#include "content/browser/ssl/ssl_request_info.h" |
| #include "content/browser/web_contents/web_contents_impl.h" |
| #include "content/common/ssl_status_serialization.h" |
| #include "content/public/browser/browser_context.h" |
| @@ -144,32 +143,16 @@ void SSLManager::DidRunInsecureContent(const GURL& security_origin) { |
| void SSLManager::DidLoadFromMemoryCache( |
| const LoadFromMemoryCacheDetails& details) { |
| // Simulate loading this resource through the usual path. |
| - // Note that we specify SUB_RESOURCE as the resource type as WebCore only |
| - // caches sub-resources. |
| - // This resource must have been loaded with no filtering because filtered |
| - // resouces aren't cachable. |
|
felt
2016/08/04 17:16:09
I'm puzzled by this part. Someone, at some point,
estark
2016/08/04 17:25:04
My guess is that this dates back to, oh, 2009 or s
felt
2016/08/04 17:26:24
AHhh yes, that history makes sense.
|
| - scoped_refptr<SSLRequestInfo> info(new SSLRequestInfo( |
| - details.url, |
| - RESOURCE_TYPE_SUB_RESOURCE, |
| - details.cert_id, |
| - details.cert_status)); |
| - |
| - // Simulate loading this resource through the usual path. |
| - policy()->OnRequestStarted(info.get()); |
|
felt
2016/08/04 17:16:09
jww: Is it correct that DidLoadFromMemoryCache is
jww
2016/08/04 18:18:10
It seems very possible that this would happen. We
|
| + policy()->OnRequestStarted(details.url, details.cert_id, details.cert_status); |
| } |
| void SSLManager::DidStartResourceResponse( |
| const ResourceRequestDetails& details) { |
| - scoped_refptr<SSLRequestInfo> info(new SSLRequestInfo( |
| - details.url, |
| - details.resource_type, |
| - details.ssl_cert_id, |
| - details.ssl_cert_status)); |
| - |
| // Notify our policy that we started a resource request. Ideally, the |
| // policy should have the ability to cancel the request, but we can't do |
| // that yet. |
| - policy()->OnRequestStarted(info.get()); |
| + policy()->OnRequestStarted(details.url, details.ssl_cert_id, |
| + details.ssl_cert_status); |
| } |
| void SSLManager::DidReceiveResourceRedirect( |