diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-07-14 17:41:05 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-08-04 12:37:36 +0000 |
| commit | 399c965b6064c440ddcf4015f5f8e9d131c7a0a6 (patch) | |
| tree | 6b06b60ff365abef0e13b3503d593a0df48d20e8 /chromium/net/url_request/url_request_http_job.cc | |
| parent | 7366110654eec46f21b6824f302356426f48cd74 (diff) | |
| download | qtwebengine-chromium-399c965b6064c440ddcf4015f5f8e9d131c7a0a6.tar.gz | |
BASELINE: Update Chromium to 52.0.2743.76 and Ninja to 1.7.1
Change-Id: I382f51b959689505a60f8b707255ecb344f7d8b4
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/net/url_request/url_request_http_job.cc')
| -rw-r--r-- | chromium/net/url_request/url_request_http_job.cc | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/chromium/net/url_request/url_request_http_job.cc b/chromium/net/url_request/url_request_http_job.cc index 51b69082430..aa8ca6670ba 100644 --- a/chromium/net/url_request/url_request_http_job.cc +++ b/chromium/net/url_request/url_request_http_job.cc @@ -18,7 +18,7 @@ #include "base/rand_util.h" #include "base/single_thread_task_runner.h" #include "base/strings/string_util.h" -#include "base/thread_task_runner_handle.h" +#include "base/threading/thread_task_runner_handle.h" #include "base/time/time.h" #include "base/trace_event/trace_event.h" #include "base/values.h" @@ -26,7 +26,6 @@ #include "net/base/load_flags.h" #include "net/base/net_errors.h" #include "net/base/network_delegate.h" -#include "net/base/network_quality_estimator.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "net/base/sdch_manager.h" #include "net/base/sdch_net_log_params.h" @@ -42,6 +41,7 @@ #include "net/http/http_transaction.h" #include "net/http/http_transaction_factory.h" #include "net/http/http_util.h" +#include "net/nqe/network_quality_estimator.h" #include "net/proxy/proxy_info.h" #include "net/ssl/channel_id_service.h" #include "net/ssl/ssl_cert_request_info.h" @@ -141,8 +141,7 @@ void LogChannelIDAndCookieStores(const GURL& url, ephemerality = CID_EPHEMERAL_COOKIE_PERSISTENT; } } else if (cookie_store->IsEphemeral()) { - // TODO(crbug.com/599049): Add NOTREACHED once this case doesn't happen on - // iOS anymore. + NOTREACHED(); ephemerality = CID_PERSISTENT_COOKIE_EPHEMERAL; } else if (cookie_store->GetChannelIDServiceID() == -1) { ephemerality = PERSISTENT_UNKNOWN; @@ -711,9 +710,7 @@ void URLRequestHttpJob::AddExtraHeaders() { // Advertise "br" encoding only if transferred data is opaque to proxy. bool advertise_brotli = false; - const HttpNetworkSession::Params* network_session_params = - request()->context()->GetNetworkSessionParams(); - if (network_session_params && network_session_params->enable_brotli) + if (request()->context()->enable_brotli()) advertise_brotli = request()->url().SchemeIsCryptographic(); // Supply Accept-Encoding headers first so that it is more likely that they @@ -1228,10 +1225,10 @@ void URLRequestHttpJob::PopulateNetErrorDetails( return transaction_->PopulateNetErrorDetails(details); } -Filter* URLRequestHttpJob::SetupFilter() const { +std::unique_ptr<Filter> URLRequestHttpJob::SetupFilter() const { DCHECK(transaction_.get()); if (!response_info_) - return NULL; + return nullptr; std::vector<Filter::FilterType> encoding_types; std::string encoding_type; @@ -1620,7 +1617,9 @@ void URLRequestHttpJob::RecordPerfHistograms(CompletionCause reason) { "Net.HttpJob.TotalTimeCached.Secure.NotQuic", total_time); } } - } else { + if (response_info_->unused_since_prefetch) + UMA_HISTOGRAM_COUNTS("Net.Prefetch.HitBytes", prefilter_bytes_read()); + } else { UMA_HISTOGRAM_TIMES("Net.HttpJob.TotalTimeNotCached", total_time); if (is_https_google) { if (used_quic) { |