OLD | NEW |
---|---|
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 "chrome/browser/net/preconnect.h" | 5 #include "chrome/browser/net/preconnect.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/metrics/histogram.h" | 9 #include "base/metrics/histogram.h" |
10 #include "content/public/browser/browser_thread.h" | 10 #include "content/public/browser/browser_thread.h" |
11 #include "net/base/load_flags.h" | |
11 #include "net/http/http_network_session.h" | 12 #include "net/http/http_network_session.h" |
12 #include "net/http/http_request_info.h" | 13 #include "net/http/http_request_info.h" |
13 #include "net/http/http_stream_factory.h" | 14 #include "net/http/http_stream_factory.h" |
14 #include "net/http/http_transaction_factory.h" | 15 #include "net/http/http_transaction_factory.h" |
15 #include "net/log/net_log.h" | 16 #include "net/log/net_log.h" |
16 #include "net/ssl/ssl_config_service.h" | 17 #include "net/ssl/ssl_config_service.h" |
17 #include "net/url_request/http_user_agent_settings.h" | 18 #include "net/url_request/http_user_agent_settings.h" |
18 #include "net/url_request/url_request_context.h" | 19 #include "net/url_request/url_request_context.h" |
19 #include "net/url_request/url_request_context_getter.h" | 20 #include "net/url_request/url_request_context_getter.h" |
20 | 21 |
21 using content::BrowserThread; | 22 using content::BrowserThread; |
22 | 23 |
23 namespace chrome_browser_net { | 24 namespace chrome_browser_net { |
24 | 25 |
25 void PreconnectOnUIThread( | 26 void PreconnectOnUIThread( |
26 const GURL& url, | 27 const GURL& url, |
27 const GURL& first_party_for_cookies, | 28 const GURL& first_party_for_cookies, |
28 UrlInfo::ResolutionMotivation motivation, | 29 UrlInfo::ResolutionMotivation motivation, |
29 int count, | 30 int count, |
30 net::URLRequestContextGetter* getter) { | 31 net::URLRequestContextGetter* getter) { |
31 // Prewarm connection to Search URL. | 32 // Prewarm connection to Search URL. |
32 BrowserThread::PostTask( | 33 BrowserThread::PostTask( |
33 BrowserThread::IO, | 34 BrowserThread::IO, FROM_HERE, |
34 FROM_HERE, | |
35 base::Bind(&PreconnectOnIOThread, url, first_party_for_cookies, | 35 base::Bind(&PreconnectOnIOThread, url, first_party_for_cookies, |
36 motivation, count, make_scoped_refptr(getter))); | 36 motivation, count, make_scoped_refptr(getter), false)); |
37 return; | 37 return; |
38 } | 38 } |
39 | 39 |
40 | 40 void PreconnectOnIOThread(const GURL& url, |
41 void PreconnectOnIOThread( | 41 const GURL& first_party_for_cookies, |
42 const GURL& url, | 42 UrlInfo::ResolutionMotivation motivation, |
43 const GURL& first_party_for_cookies, | 43 int count, |
44 UrlInfo::ResolutionMotivation motivation, | 44 net::URLRequestContextGetter* getter, |
45 int count, | 45 bool allow_credentials) { |
46 net::URLRequestContextGetter* getter) { | |
47 if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) { | 46 if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) { |
48 LOG(DFATAL) << "This must be run only on the IO thread."; | 47 LOG(DFATAL) << "This must be run only on the IO thread."; |
49 return; | 48 return; |
50 } | 49 } |
51 if (!getter) | 50 if (!getter) |
52 return; | 51 return; |
53 // We are now commited to doing the async preconnection call. | 52 // We are now commited to doing the async preconnection call. |
54 UMA_HISTOGRAM_ENUMERATION("Net.PreconnectMotivation", motivation, | 53 UMA_HISTOGRAM_ENUMERATION("Net.PreconnectMotivation", motivation, |
55 UrlInfo::MAX_MOTIVATED); | 54 UrlInfo::MAX_MOTIVATED); |
56 | 55 |
57 net::URLRequestContext* context = getter->GetURLRequestContext(); | 56 net::URLRequestContext* context = getter->GetURLRequestContext(); |
58 net::HttpTransactionFactory* factory = context->http_transaction_factory(); | 57 net::HttpTransactionFactory* factory = context->http_transaction_factory(); |
59 net::HttpNetworkSession* session = factory->GetSession(); | 58 net::HttpNetworkSession* session = factory->GetSession(); |
60 | 59 |
61 std::string user_agent; | 60 std::string user_agent; |
62 if (context->http_user_agent_settings()) | 61 if (context->http_user_agent_settings()) |
63 user_agent = context->http_user_agent_settings()->GetUserAgent(); | 62 user_agent = context->http_user_agent_settings()->GetUserAgent(); |
64 net::HttpRequestInfo request_info; | 63 net::HttpRequestInfo request_info; |
65 request_info.url = url; | 64 request_info.url = url; |
66 request_info.method = "GET"; | 65 request_info.method = "GET"; |
67 request_info.extra_headers.SetHeader(net::HttpRequestHeaders::kUserAgent, | 66 request_info.extra_headers.SetHeader(net::HttpRequestHeaders::kUserAgent, |
68 user_agent); | 67 user_agent); |
69 | 68 |
70 net::NetworkDelegate* delegate = context->network_delegate(); | 69 net::NetworkDelegate* delegate = context->network_delegate(); |
71 if (delegate->CanEnablePrivacyMode(url, first_party_for_cookies)) | 70 if (delegate->CanEnablePrivacyMode(url, first_party_for_cookies)) |
72 request_info.privacy_mode = net::PRIVACY_MODE_ENABLED; | 71 request_info.privacy_mode = net::PRIVACY_MODE_ENABLED; |
mmenke
2015/07/09 15:55:56
Wait...Privacy mode is completely separate from al
Yoav Weiss
2015/07/09 16:19:39
Ryan suggested that it's better to separate them h
mmenke
2015/07/09 16:31:30
I'm not really following that. So if we have prec
Ryan Sleevi
2015/07/10 09:34:22
It does, but it's a layering thing. See comment be
| |
73 | 72 |
73 if (!allow_credentials) | |
74 request_info.load_flags = net::LOAD_DO_NOT_SEND_COOKIES | | |
75 net::LOAD_DO_NOT_SAVE_COOKIES | | |
76 net::LOAD_DO_NOT_SEND_AUTH_DATA; | |
mmenke
2015/07/09 15:55:56
nit: Use braces when the body of an if takes up m
Yoav Weiss
2015/07/09 16:19:39
added
| |
77 | |
74 // It almost doesn't matter whether we use net::LOWEST or net::HIGHEST | 78 // It almost doesn't matter whether we use net::LOWEST or net::HIGHEST |
75 // priority here, as we won't make a request, and will surrender the created | 79 // priority here, as we won't make a request, and will surrender the created |
76 // socket to the pool as soon as we can. However, we would like to mark the | 80 // socket to the pool as soon as we can. However, we would like to mark the |
77 // speculative socket as such, and IF we use a net::LOWEST priority, and if | 81 // speculative socket as such, and IF we use a net::LOWEST priority, and if |
78 // a navigation asked for a socket (after us) then it would get our socket, | 82 // a navigation asked for a socket (after us) then it would get our socket, |
79 // and we'd get its later-arriving socket, which might make us record that | 83 // and we'd get its later-arriving socket, which might make us record that |
80 // the speculation didn't help :-/. By using net::HIGHEST, we ensure that | 84 // the speculation didn't help :-/. By using net::HIGHEST, we ensure that |
81 // a socket is given to us if "we asked first" and this allows us to mark it | 85 // a socket is given to us if "we asked first" and this allows us to mark it |
82 // as speculative, and better detect stats (if it gets used). | 86 // as speculative, and better detect stats (if it gets used). |
83 // TODO(jar): histogram to see how often we accidentally use a previously- | 87 // TODO(jar): histogram to see how often we accidentally use a previously- |
(...skipping 27 matching lines...) Expand all Loading... | |
111 | 115 |
112 // All preconnects should perform EV certificate verification. | 116 // All preconnects should perform EV certificate verification. |
113 ssl_config.verify_ev_cert = true; | 117 ssl_config.verify_ev_cert = true; |
114 | 118 |
115 net::HttpStreamFactory* http_stream_factory = session->http_stream_factory(); | 119 net::HttpStreamFactory* http_stream_factory = session->http_stream_factory(); |
116 http_stream_factory->PreconnectStreams(count, request_info, priority, | 120 http_stream_factory->PreconnectStreams(count, request_info, priority, |
117 ssl_config, ssl_config); | 121 ssl_config, ssl_config); |
118 } | 122 } |
119 | 123 |
120 } // namespace chrome_browser_net | 124 } // namespace chrome_browser_net |
OLD | NEW |