Chromium Code Reviews| 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" |
| (...skipping 15 matching lines...) Expand all Loading... | |
| 26 const GURL& url, | 26 const GURL& url, |
| 27 const GURL& first_party_for_cookies, | 27 const GURL& first_party_for_cookies, |
| 28 UrlInfo::ResolutionMotivation motivation, | 28 UrlInfo::ResolutionMotivation motivation, |
| 29 int count, | 29 int count, |
| 30 net::URLRequestContextGetter* getter) { | 30 net::URLRequestContextGetter* getter) { |
| 31 // Prewarm connection to Search URL. | 31 // Prewarm connection to Search URL. |
| 32 BrowserThread::PostTask( | 32 BrowserThread::PostTask( |
| 33 BrowserThread::IO, | 33 BrowserThread::IO, |
| 34 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 |
| 41 void PreconnectOnIOThread( | 41 void PreconnectOnIOThread( |
| 42 const GURL& url, | 42 const GURL& url, |
| 43 const GURL& first_party_for_cookies, | 43 const GURL& first_party_for_cookies, |
| 44 UrlInfo::ResolutionMotivation motivation, | 44 UrlInfo::ResolutionMotivation motivation, |
| 45 int count, | 45 int count, |
| 46 net::URLRequestContextGetter* getter) { | 46 net::URLRequestContextGetter* getter, |
| 47 bool isAnonymous) { | |
| 47 if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) { | 48 if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) { |
| 48 LOG(DFATAL) << "This must be run only on the IO thread."; | 49 LOG(DFATAL) << "This must be run only on the IO thread."; |
| 49 return; | 50 return; |
| 50 } | 51 } |
| 51 if (!getter) | 52 if (!getter) |
| 52 return; | 53 return; |
| 53 // We are now commited to doing the async preconnection call. | 54 // We are now commited to doing the async preconnection call. |
| 54 UMA_HISTOGRAM_ENUMERATION("Net.PreconnectMotivation", motivation, | 55 UMA_HISTOGRAM_ENUMERATION("Net.PreconnectMotivation", motivation, |
| 55 UrlInfo::MAX_MOTIVATED); | 56 UrlInfo::MAX_MOTIVATED); |
| 56 | 57 |
| 57 net::URLRequestContext* context = getter->GetURLRequestContext(); | 58 net::URLRequestContext* context = getter->GetURLRequestContext(); |
| 58 net::HttpTransactionFactory* factory = context->http_transaction_factory(); | 59 net::HttpTransactionFactory* factory = context->http_transaction_factory(); |
| 59 net::HttpNetworkSession* session = factory->GetSession(); | 60 net::HttpNetworkSession* session = factory->GetSession(); |
| 60 | 61 |
| 61 std::string user_agent; | 62 std::string user_agent; |
| 62 if (context->http_user_agent_settings()) | 63 if (context->http_user_agent_settings()) |
| 63 user_agent = context->http_user_agent_settings()->GetUserAgent(); | 64 user_agent = context->http_user_agent_settings()->GetUserAgent(); |
| 64 net::HttpRequestInfo request_info; | 65 net::HttpRequestInfo request_info; |
| 65 request_info.url = url; | 66 request_info.url = url; |
| 66 request_info.method = "GET"; | 67 request_info.method = "GET"; |
| 67 request_info.extra_headers.SetHeader(net::HttpRequestHeaders::kUserAgent, | 68 request_info.extra_headers.SetHeader(net::HttpRequestHeaders::kUserAgent, |
| 68 user_agent); | 69 user_agent); |
| 69 | 70 |
| 70 net::NetworkDelegate* delegate = context->network_delegate(); | 71 net::NetworkDelegate* delegate = context->network_delegate(); |
| 71 if (delegate->CanEnablePrivacyMode(url, first_party_for_cookies)) | 72 if (delegate->CanEnablePrivacyMode(url, first_party_for_cookies) |
| 73 || isAnonymous) | |
|
Ryan Sleevi
2015/06/10 19:30:41
So this is wrong. You should be using the |load_fl
Yoav Weiss
2015/06/11 12:55:14
hmm, setting request_info.load_flags to the above
| |
| 72 request_info.privacy_mode = net::PRIVACY_MODE_ENABLED; | 74 request_info.privacy_mode = net::PRIVACY_MODE_ENABLED; |
| 73 | 75 |
| 74 // It almost doesn't matter whether we use net::LOWEST or net::HIGHEST | 76 // 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 | 77 // 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 | 78 // 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 | 79 // 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, | 80 // 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 | 81 // 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 | 82 // 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 | 83 // a socket is given to us if "we asked first" and this allows us to mark it |
| (...skipping 29 matching lines...) Expand all Loading... | |
| 111 | 113 |
| 112 // All preconnects should perform EV certificate verification. | 114 // All preconnects should perform EV certificate verification. |
| 113 ssl_config.verify_ev_cert = true; | 115 ssl_config.verify_ev_cert = true; |
| 114 | 116 |
| 115 net::HttpStreamFactory* http_stream_factory = session->http_stream_factory(); | 117 net::HttpStreamFactory* http_stream_factory = session->http_stream_factory(); |
| 116 http_stream_factory->PreconnectStreams(count, request_info, priority, | 118 http_stream_factory->PreconnectStreams(count, request_info, priority, |
| 117 ssl_config, ssl_config); | 119 ssl_config, ssl_config); |
| 118 } | 120 } |
| 119 | 121 |
| 120 } // namespace chrome_browser_net | 122 } // namespace chrome_browser_net |
| OLD | NEW |