diff options
Diffstat (limited to 'chromium/net/log')
33 files changed, 71 insertions, 69 deletions
diff --git a/chromium/net/log/file_net_log_observer.cc b/chromium/net/log/file_net_log_observer.cc index b1a1a91b4e1..8b034930ca1 100644 --- a/chromium/net/log/file_net_log_observer.cc +++ b/chromium/net/log/file_net_log_observer.cc @@ -1,4 +1,4 @@ -// Copyright 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/log/file_net_log_observer.h b/chromium/net/log/file_net_log_observer.h index 00569a61db8..071d7d7de14 100644 --- a/chromium/net/log/file_net_log_observer.h +++ b/chromium/net/log/file_net_log_observer.h @@ -1,4 +1,4 @@ -// Copyright 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/log/file_net_log_observer_unittest.cc b/chromium/net/log/file_net_log_observer_unittest.cc index acc6c5a0090..95875253d3e 100644 --- a/chromium/net/log/file_net_log_observer_unittest.cc +++ b/chromium/net/log/file_net_log_observer_unittest.cc @@ -1,4 +1,4 @@ -// Copyright 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/log/net_log.cc b/chromium/net/log/net_log.cc index 6ea2341512d..53177340737 100644 --- a/chromium/net/log/net_log.cc +++ b/chromium/net/log/net_log.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2012 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,6 +8,7 @@ #include "base/containers/contains.h" #include "base/no_destructor.h" #include "base/notreached.h" +#include "base/ranges/algorithm.h" #include "base/strings/string_number_conversions.h" #include "base/values.h" #include "net/log/net_log_values.h" @@ -104,7 +105,7 @@ void NetLog::RemoveObserver(NetLog::ThreadSafeObserver* observer) { DCHECK_EQ(this, observer->net_log_); - auto it = std::find(observers_.begin(), observers_.end(), observer); + auto it = base::ranges::find(observers_, observer); DCHECK(it != observers_.end()); observers_.erase(it); @@ -132,8 +133,7 @@ void NetLog::RemoveCaptureModeObserver( DCHECK_EQ(this, observer->net_log_); DCHECK(HasCaptureModeObserver(observer)); - auto it = std::find(capture_mode_observers_.begin(), - capture_mode_observers_.end(), observer); + auto it = base::ranges::find(capture_mode_observers_, observer); DCHECK(it != capture_mode_observers_.end()); capture_mode_observers_.erase(it); diff --git a/chromium/net/log/net_log.h b/chromium/net/log/net_log.h index d041ab81311..d07c0384618 100644 --- a/chromium/net/log/net_log.h +++ b/chromium/net/log/net_log.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2012 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/log/net_log_capture_mode.cc b/chromium/net/log/net_log_capture_mode.cc index 40b072aa9f8..32851e2dff7 100644 --- a/chromium/net/log/net_log_capture_mode.cc +++ b/chromium/net/log/net_log_capture_mode.cc @@ -1,4 +1,4 @@ -// Copyright 2015 The Chromium Authors. All rights reserved. +// Copyright 2015 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/log/net_log_capture_mode.h b/chromium/net/log/net_log_capture_mode.h index cef1b25cff1..1760e195a4f 100644 --- a/chromium/net/log/net_log_capture_mode.h +++ b/chromium/net/log/net_log_capture_mode.h @@ -1,4 +1,4 @@ -// Copyright 2015 The Chromium Authors. All rights reserved. +// Copyright 2015 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/log/net_log_capture_mode_unittest.cc b/chromium/net/log/net_log_capture_mode_unittest.cc index ea4fa30c7c2..dc381ba842d 100644 --- a/chromium/net/log/net_log_capture_mode_unittest.cc +++ b/chromium/net/log/net_log_capture_mode_unittest.cc @@ -1,4 +1,4 @@ -// Copyright 2015 The Chromium Authors. All rights reserved. +// Copyright 2015 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/log/net_log_entry.cc b/chromium/net/log/net_log_entry.cc index 25c763e482a..2045440520d 100644 --- a/chromium/net/log/net_log_entry.cc +++ b/chromium/net/log/net_log_entry.cc @@ -1,4 +1,4 @@ -// Copyright 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/log/net_log_entry.h b/chromium/net/log/net_log_entry.h index e2013bf7a65..4e213da9660 100644 --- a/chromium/net/log/net_log_entry.h +++ b/chromium/net/log/net_log_entry.h @@ -1,4 +1,4 @@ -// Copyright 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/log/net_log_event_type.cc b/chromium/net/log/net_log_event_type.cc index 069b3dca603..fd02d8044f3 100644 --- a/chromium/net/log/net_log_event_type.cc +++ b/chromium/net/log/net_log_event_type.cc @@ -1,4 +1,4 @@ -// Copyright 2022 The Chromium Authors. All rights reserved. +// Copyright 2022 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/log/net_log_event_type.h b/chromium/net/log/net_log_event_type.h index 1a58d675698..396b4280752 100644 --- a/chromium/net/log/net_log_event_type.h +++ b/chromium/net/log/net_log_event_type.h @@ -1,4 +1,4 @@ -// Copyright 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/log/net_log_event_type_list.h b/chromium/net/log/net_log_event_type_list.h index 352db1172b7..8f11ed037d5 100644 --- a/chromium/net/log/net_log_event_type_list.h +++ b/chromium/net/log/net_log_event_type_list.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2012 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -53,7 +53,7 @@ EVENT_TYPE(REQUEST_ALIVE) // the host cache>, // "is_speculative": <Whether this request was started by the DNS // prefetcher>, -// "network_isolation_key": <NetworkIsolationKey associated with the +// "network_isolation_key": <NetworkAnonymizationKey associated with the // request>, // "secure_dns_policy": <SecureDnsPolicy of the request>, // } @@ -106,9 +106,9 @@ EVENT_TYPE(HOST_RESOLVER_MANAGER_CREATE_JOB) // { // "dns_query_type": <DnsQueryType of the job>, // "host": <Serialized scheme/host/port associated with the job>, -// "network_isolation_key": <NetworkIsolationKey associated with the job>, -// "secure_dns_mode": <SecureDnsMode of the job>, -// "source_dependency": <Source id, if any, of what created the job>, +// "network_isolation_key": <NetworkAnonymizationKey associated with the +// job>, "secure_dns_mode": <SecureDnsMode of the job>, "source_dependency": +// <Source id, if any, of what created the job>, // } // // The END phase will contain these parameters: @@ -183,8 +183,8 @@ EVENT_TYPE(HOST_RESOLVER_MANAGER_JOB_REQUEST_ATTACH) // } EVENT_TYPE(HOST_RESOLVER_MANAGER_JOB_REQUEST_DETACH) -// The creation/completion of a HostResolverManager::ProcTask to call -// getaddrinfo. The BEGIN phase contains the following parameters: +// The creation/completion of a HostResolverSystemTask to call getaddrinfo. The +// BEGIN phase contains the following parameters: // // { // "hostname": <Hostname associated with the request>, @@ -199,7 +199,7 @@ EVENT_TYPE(HOST_RESOLVER_MANAGER_JOB_REQUEST_DETACH) // "net_error": <The net error code integer for the failure>, // "os_error": <The exact error code integer that getaddrinfo() returned>, // } -EVENT_TYPE(HOST_RESOLVER_MANAGER_PROC_TASK) +EVENT_TYPE(HOST_RESOLVER_SYSTEM_TASK) // The creation/completion of a HostResolverManager::DnsTask to manage a // DnsTransaction. The BEGIN phase contains the following parameters: @@ -795,6 +795,21 @@ EVENT_TYPE(HTTP_PROXY_CONNECT_JOB_CONNECT) // } EVENT_TYPE(SSL_CONNECT_JOB_RESTART_WITH_ECH_CONFIG_LIST) +// This event is logged when the TransportConnectJob IPv6 fallback timer expires +// and the IPv4 addresses are attempted. +EVENT_TYPE(TRANSPORT_CONNECT_JOB_IPV6_FALLBACK) + +// This event is logged whenever the ConnectJob attempts a new TCP connection. +// association. The ConnectJob may attempt multiple addresses in parallel, so +// this event does not log when the connection attempt succeeds or fails. The +// source dependency may be used to determine this. +// +// { +// "address": <String of the network address being attempted>, +// "source_dependency": <The source identifier for the new socket.>, +// } +EVENT_TYPE(TRANSPORT_CONNECT_JOB_CONNECT_ATTEMPT) + // ------------------------------------------------------------------------ // ClientSocketPoolBaseHelper // ------------------------------------------------------------------------ @@ -1760,7 +1775,7 @@ EVENT_TYPE(HTTP2_PROXY_CLIENT_SESSION) // "host": <The origin hostname that the Job serves>, // "port": <The origin port>, // "privacy_mode": <The privacy mode of the Job>, -// "network_isolation_key": <The NetworkIsolationKey of the Job>, +// "network_anonymization_key": <The NetworkAnonymizationKey of the Job>, // } EVENT_TYPE(QUIC_STREAM_FACTORY_JOB) @@ -1807,9 +1822,11 @@ EVENT_TYPE(QUIC_STREAM_FACTORY_JOB_STALE_HOST_RESOLUTION_MATCHED) // "host": <The origin hostname string>, // "port": <The origin port>, // "privacy_mode": <The privacy mode of the session>, -// "network_isolation_key": <The NetworkIsolationKey of the session>, -// "require_confirmation": <True if the session will wait for a successful -// QUIC handshake before vending streams>, +// "network_anonymization_key": <The NetworkAnonymizationKey of the +// session>, +// "require_confirmation": <True if the session will wait for a +// successful QUIC handshake before vending +// streams>, // "cert_verify_flags": <The certificate verification flags for the // session>, // } diff --git a/chromium/net/log/net_log_source.cc b/chromium/net/log/net_log_source.cc index d19b586bd24..9342ae66a33 100644 --- a/chromium/net/log/net_log_source.cc +++ b/chromium/net/log/net_log_source.cc @@ -1,4 +1,4 @@ -// Copyright 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -7,26 +7,10 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/check_op.h" #include "base/values.h" -#include "net/log/net_log_capture_mode.h" namespace net { -namespace { - -base::Value SourceEventParametersCallback(const NetLogSource source) { - if (!source.IsValid()) - return base::Value(); - base::Value::Dict event_params; - source.AddToEventParameters(event_params); - return base::Value(std::move(event_params)); -} - -} // namespace - // LoadTimingInfo requires this be 0. const uint32_t NetLogSource::kInvalidId = 0; @@ -57,7 +41,11 @@ void NetLogSource::AddToEventParameters(base::Value::Dict& event_params) const { } base::Value NetLogSource::ToEventParameters() const { - return SourceEventParametersCallback(*this); + if (!IsValid()) + return base::Value(); + base::Value::Dict event_params; + AddToEventParameters(event_params); + return base::Value(std::move(event_params)); } } // namespace net diff --git a/chromium/net/log/net_log_source.h b/chromium/net/log/net_log_source.h index 9ce41b3ec4a..50b502f406b 100644 --- a/chromium/net/log/net_log_source.h +++ b/chromium/net/log/net_log_source.h @@ -1,4 +1,4 @@ -// Copyright 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/log/net_log_source_type.h b/chromium/net/log/net_log_source_type.h index 72ea14d18ca..c3ff70d4621 100644 --- a/chromium/net/log/net_log_source_type.h +++ b/chromium/net/log/net_log_source_type.h @@ -1,4 +1,4 @@ -// Copyright 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/log/net_log_source_type_list.h b/chromium/net/log/net_log_source_type_list.h index 55a66fce82c..4efa9dabf98 100644 --- a/chromium/net/log/net_log_source_type_list.h +++ b/chromium/net/log/net_log_source_type_list.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2012 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/log/net_log_unittest.cc b/chromium/net/log/net_log_unittest.cc index da4c60ba04a..772f6ea0ad9 100644 --- a/chromium/net/log/net_log_unittest.cc +++ b/chromium/net/log/net_log_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2013 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/log/net_log_util.cc b/chromium/net/log/net_log_util.cc index 216771e804b..cfc9c648a76 100644 --- a/chromium/net/log/net_log_util.cc +++ b/chromium/net/log/net_log_util.cc @@ -1,4 +1,4 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/log/net_log_util.h b/chromium/net/log/net_log_util.h index de00035727b..8406bf304cf 100644 --- a/chromium/net/log/net_log_util.h +++ b/chromium/net/log/net_log_util.h @@ -1,4 +1,4 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/log/net_log_util_unittest.cc b/chromium/net/log/net_log_util_unittest.cc index 9b3a0c8d174..ba8026dc787 100644 --- a/chromium/net/log/net_log_util_unittest.cc +++ b/chromium/net/log/net_log_util_unittest.cc @@ -1,4 +1,4 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -75,11 +75,8 @@ TEST(NetLogUtil, GetNetInfoIncludesFieldTrials) { std::make_unique<base::FeatureList>()); // Add and activate a new Field Trial. - base::FieldTrial* field_trial = base::FieldTrialList::FactoryGetFieldTrial( - "NewFieldTrial", 100, "Default", base::FieldTrial::ONE_TIME_RANDOMIZED, - nullptr); - field_trial->AppendGroup("Active", 100); - EXPECT_EQ(field_trial->group_name(), "Active"); + base::FieldTrialList::CreateFieldTrial("NewFieldTrial", "Active"); + EXPECT_EQ(base::FieldTrialList::FindFullName("NewFieldTrial"), "Active"); auto context = CreateTestURLRequestContextBuilder()->Build(); base::Value net_info(GetNetInfo(context.get())); diff --git a/chromium/net/log/net_log_values.cc b/chromium/net/log/net_log_values.cc index e87ea6595fb..3c2f0f929ce 100644 --- a/chromium/net/log/net_log_values.cc +++ b/chromium/net/log/net_log_values.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2012 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/log/net_log_values.h b/chromium/net/log/net_log_values.h index 471adbd32f2..bae04e666ec 100644 --- a/chromium/net/log/net_log_values.h +++ b/chromium/net/log/net_log_values.h @@ -1,4 +1,4 @@ -// Copyright (c) 2019 The Chromium Authors. All rights reserved. +// Copyright 2019 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/log/net_log_values_unittest.cc b/chromium/net/log/net_log_values_unittest.cc index fd5396c5dd7..fbd11b5642d 100644 --- a/chromium/net/log/net_log_values_unittest.cc +++ b/chromium/net/log/net_log_values_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2013 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/log/net_log_with_source.cc b/chromium/net/log/net_log_with_source.cc index edf4865aa6f..b4af2e43d8f 100644 --- a/chromium/net/log/net_log_with_source.cc +++ b/chromium/net/log/net_log_with_source.cc @@ -1,4 +1,4 @@ -// Copyright 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/log/net_log_with_source.h b/chromium/net/log/net_log_with_source.h index b8143998808..c4e8f9e2c6c 100644 --- a/chromium/net/log/net_log_with_source.h +++ b/chromium/net/log/net_log_with_source.h @@ -1,4 +1,4 @@ -// Copyright 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/log/test_net_log.cc b/chromium/net/log/test_net_log.cc index e526263241a..cf7739c8f11 100644 --- a/chromium/net/log/test_net_log.cc +++ b/chromium/net/log/test_net_log.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2012 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/log/test_net_log.h b/chromium/net/log/test_net_log.h index adbbebe1ec9..9cf081984c4 100644 --- a/chromium/net/log/test_net_log.h +++ b/chromium/net/log/test_net_log.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2012 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/log/test_net_log_util.cc b/chromium/net/log/test_net_log_util.cc index 794234ef33f..9c62fc7b3e1 100644 --- a/chromium/net/log/test_net_log_util.cc +++ b/chromium/net/log/test_net_log_util.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2012 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/log/test_net_log_util.h b/chromium/net/log/test_net_log_util.h index 9caef59fd25..2fae1ada3a3 100644 --- a/chromium/net/log/test_net_log_util.h +++ b/chromium/net/log/test_net_log_util.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2012 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/log/trace_net_log_observer.cc b/chromium/net/log/trace_net_log_observer.cc index 1ffddd05542..b5669a353ca 100644 --- a/chromium/net/log/trace_net_log_observer.cc +++ b/chromium/net/log/trace_net_log_observer.cc @@ -1,4 +1,4 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/log/trace_net_log_observer.h b/chromium/net/log/trace_net_log_observer.h index 568f533f609..eda1f92cc24 100644 --- a/chromium/net/log/trace_net_log_observer.h +++ b/chromium/net/log/trace_net_log_observer.h @@ -1,4 +1,4 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/log/trace_net_log_observer_unittest.cc b/chromium/net/log/trace_net_log_observer_unittest.cc index 2f73e4dd916..2f8f17d246e 100644 --- a/chromium/net/log/trace_net_log_observer_unittest.cc +++ b/chromium/net/log/trace_net_log_observer_unittest.cc @@ -1,4 +1,4 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. |