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

Unified Diff: chrome/browser/net/preconnect.cc

Issue 284423002: Remove HttpStreamFactory's NPN/SPDY globals, except for spdy_enabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix merge Created 6 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/io_thread.cc ('k') | chrome/browser/policy/url_blacklist_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/net/preconnect.cc
diff --git a/chrome/browser/net/preconnect.cc b/chrome/browser/net/preconnect.cc
index ee0a6690c9191b9dc42c5017687c652259d18b34..987c091fd961d3dfd35a8ea9cb240097e60f8caf 100644
--- a/chrome/browser/net/preconnect.cc
+++ b/chrome/browser/net/preconnect.cc
@@ -107,8 +107,7 @@ void PreconnectOnIOThread(
// Setup the SSL Configuration.
net::SSLConfig ssl_config;
session->ssl_config_service()->GetSSLConfig(&ssl_config);
- if (session->http_stream_factory()->has_next_protos())
- ssl_config.next_protos = session->http_stream_factory()->next_protos();
+ session->GetNextProtos(&ssl_config.next_protos);
// All preconnects should perform EV certificate verification.
ssl_config.verify_ev_cert = true;
« no previous file with comments | « chrome/browser/io_thread.cc ('k') | chrome/browser/policy/url_blacklist_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698