Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(310)

Side by Side Diff: content/browser/loader/resource_loader.cc

Issue 1313363003: Expose OpenSSL's key_exchange_info in the content API (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Proper #ifdef fix Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | content/common/ssl_status_serialization.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/loader/resource_loader.h" 5 #include "content/browser/loader/resource_loader.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/location.h" 8 #include "base/location.h"
9 #include "base/metrics/histogram.h" 9 #include "base/metrics/histogram.h"
10 #include "base/profiler/scoped_tracker.h" 10 #include "base/profiler/scoped_tracker.h"
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 if (info->is_load_timing_enabled()) 104 if (info->is_load_timing_enabled())
105 request->GetLoadTimingInfo(&response->head.load_timing); 105 request->GetLoadTimingInfo(&response->head.load_timing);
106 106
107 if (request->ssl_info().cert.get()) { 107 if (request->ssl_info().cert.get()) {
108 SSLStatus ssl_status; 108 SSLStatus ssl_status;
109 GetSSLStatusForRequest(request->url(), request->ssl_info(), 109 GetSSLStatusForRequest(request->url(), request->ssl_info(),
110 info->GetChildID(), &ssl_status); 110 info->GetChildID(), &ssl_status);
111 response->head.security_info = SerializeSecurityInfo(ssl_status); 111 response->head.security_info = SerializeSecurityInfo(ssl_status);
112 } else { 112 } else {
113 // We should not have any SSL state. 113 // We should not have any SSL state.
114 DCHECK(!request->ssl_info().cert_status && 114 DCHECK(!request->ssl_info().cert_status);
115 request->ssl_info().security_bits == -1 && 115 DCHECK_EQ(request->ssl_info().security_bits, -1);
116 !request->ssl_info().connection_status); 116 DCHECK_EQ(request->ssl_info().key_exchange_info, 0);
117 DCHECK(!request->ssl_info().connection_status);
117 } 118 }
118 } 119 }
119 120
120 } // namespace 121 } // namespace
121 122
122 ResourceLoader::ResourceLoader(scoped_ptr<net::URLRequest> request, 123 ResourceLoader::ResourceLoader(scoped_ptr<net::URLRequest> request,
123 scoped_ptr<ResourceHandler> handler, 124 scoped_ptr<ResourceHandler> handler,
124 ResourceLoaderDelegate* delegate) 125 ResourceLoaderDelegate* delegate)
125 : deferred_stage_(DEFERRED_NONE), 126 : deferred_stage_(DEFERRED_NONE),
126 request_(request.Pass()), 127 request_(request.Pass()),
(...skipping 569 matching lines...) Expand 10 before | Expand all | Expand 10 after
696 case net::URLRequestStatus::FAILED: 697 case net::URLRequestStatus::FAILED:
697 status = STATUS_UNDEFINED; 698 status = STATUS_UNDEFINED;
698 break; 699 break;
699 } 700 }
700 701
701 UMA_HISTOGRAM_ENUMERATION("Net.Prefetch.Pattern", status, STATUS_MAX); 702 UMA_HISTOGRAM_ENUMERATION("Net.Prefetch.Pattern", status, STATUS_MAX);
702 } 703 }
703 } 704 }
704 705
705 } // namespace content 706 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/common/ssl_status_serialization.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698