diff --git a/net/base/address_list.cc b/net/base/address_list.cc index 94eea32bf5d621..428210645a11c0 100644 --- a/net/base/address_list.cc +++ b/net/base/address_list.cc @@ -79,7 +79,7 @@ base::Value AddressList::NetLogParams() const { base::Value list(base::Value::Type::LIST); for (const auto& ip_endpoint : *this) - list.GetList().emplace_back(ip_endpoint.ToString()); + list.Append(ip_endpoint.ToString()); dict.SetKey("address_list", std::move(list)); dict.SetStringKey("canonical_name", canonical_name()); diff --git a/net/base/network_isolation_key.cc b/net/base/network_isolation_key.cc index ea5e01a07d6ac8..0d88dbf9c6e619 100644 --- a/net/base/network_isolation_key.cc +++ b/net/base/network_isolation_key.cc @@ -86,12 +86,10 @@ bool NetworkIsolationKey::ToValue(base::Value* out_value) const { *out_value = base::Value(base::Value::Type::LIST); // Store origins GURLs, since GURL has validation logic that can be used when // loading, while Origin only has DCHECKs. - out_value->GetList().emplace_back( - base::Value(top_frame_origin_->GetURL().spec())); + out_value->Append(base::Value(top_frame_origin_->GetURL().spec())); if (use_frame_origin_) - out_value->GetList().emplace_back( - base::Value(frame_origin_->GetURL().spec())); + out_value->Append(base::Value(frame_origin_->GetURL().spec())); return true; } diff --git a/net/cert/ct_signed_certificate_timestamp_log_param.cc b/net/cert/ct_signed_certificate_timestamp_log_param.cc index e90fb45853bf10..b3f52dc0089476 100644 --- a/net/cert/ct_signed_certificate_timestamp_log_param.cc +++ b/net/cert/ct_signed_certificate_timestamp_log_param.cc @@ -63,7 +63,7 @@ base::Value SCTListToPrintableValues( const SignedCertificateTimestampAndStatusList& sct_and_status_list) { base::Value output_scts(base::Value::Type::LIST); for (const auto& sct_and_status : sct_and_status_list) - output_scts.GetList().push_back( + output_scts.Append( SCTToDictionary(*(sct_and_status.sct.get()), sct_and_status.status)); return output_scts; diff --git a/net/cert/x509_certificate_net_log_param.cc b/net/cert/x509_certificate_net_log_param.cc index aaacd0a5fe0f06..f77cb42e31ff88 100644 --- a/net/cert/x509_certificate_net_log_param.cc +++ b/net/cert/x509_certificate_net_log_param.cc @@ -21,7 +21,7 @@ base::Value NetLogX509CertificateParams(const X509Certificate* certificate) { std::vector encoded_chain; certificate->GetPEMEncodedChain(&encoded_chain); for (auto& pem : encoded_chain) - certs.GetList().emplace_back(std::move(pem)); + certs.Append(std::move(pem)); dict.SetKey("certificates", std::move(certs)); return dict; } diff --git a/net/dns/dns_config.cc b/net/dns/dns_config.cc index 0a94c7312a33f6..fcae1e0800f30d 100644 --- a/net/dns/dns_config.cc +++ b/net/dns/dns_config.cc @@ -115,7 +115,7 @@ std::unique_ptr DnsConfig::ToValue() const { val.GetAsDictionary(&dict); dict->SetString("server_template", server.server_template); dict->SetBoolean("use_post", server.use_post); - list->GetList().push_back(std::move(val)); + list->Append(std::move(val)); } dict->Set("doh_servers", std::move(list)); dict->SetInteger("secure_dns_mode", static_cast(secure_dns_mode)); diff --git a/net/dns/host_cache.cc b/net/dns/host_cache.cc index 69b2be5d52376a..33e54eccf94b3e 100644 --- a/net/dns/host_cache.cc +++ b/net/dns/host_cache.cc @@ -322,7 +322,7 @@ base::DictionaryValue HostCache::Entry::GetAsValue( // Append all of the resolved addresses. base::ListValue addresses_value; for (const IPEndPoint& address : addresses().value()) { - addresses_value.GetList().emplace_back(address.ToStringWithoutPort()); + addresses_value.Append(address.ToStringWithoutPort()); } entry_dict.SetKey(kAddressesKey, std::move(addresses_value)); } @@ -331,7 +331,7 @@ base::DictionaryValue HostCache::Entry::GetAsValue( // Append all resolved text records. base::ListValue text_list_value; for (const std::string& text_record : text_records().value()) { - text_list_value.GetList().emplace_back(text_record); + text_list_value.Append(text_record); } entry_dict.SetKey(kTextRecordsKey, std::move(text_list_value)); } @@ -341,8 +341,8 @@ base::DictionaryValue HostCache::Entry::GetAsValue( base::ListValue hostnames_value; base::ListValue host_ports_value; for (const HostPortPair& hostname : hostnames().value()) { - hostnames_value.GetList().emplace_back(hostname.host()); - host_ports_value.GetList().emplace_back(hostname.port()); + hostnames_value.Append(hostname.host()); + host_ports_value.Append(hostname.port()); } entry_dict.SetKey(kHostnameResultsKey, std::move(hostnames_value)); entry_dict.SetKey(kHostPortsKey, std::move(host_ports_value)); diff --git a/net/ftp/ftp_ctrl_response_buffer.cc b/net/ftp/ftp_ctrl_response_buffer.cc index b1bd27336a8418..ae31f46f47fbbe 100644 --- a/net/ftp/ftp_ctrl_response_buffer.cc +++ b/net/ftp/ftp_ctrl_response_buffer.cc @@ -85,7 +85,7 @@ namespace { base::Value NetLogFtpCtrlResponseParams(const FtpCtrlResponse* response) { base::ListValue lines; for (const auto& line : response->lines) - lines.GetList().push_back(NetLogStringValue(line)); + lines.Append(NetLogStringValue(line)); base::DictionaryValue dict; dict.SetInteger("status_code", response->status_code); diff --git a/net/http/http_auth_gssapi_posix.cc b/net/http/http_auth_gssapi_posix.cc index ad7ecad9ac2382..e12a7839888c24 100644 --- a/net/http/http_auth_gssapi_posix.cc +++ b/net/http/http_auth_gssapi_posix.cc @@ -168,7 +168,7 @@ base::Value GetGssStatusCodeValue(GSSAPILibrary* gssapi_lib, if (!base::IsStringUTF8(message_string)) continue; - messages.GetList().emplace_back(message_string); + messages.Append(message_string); } while (message_context != 0 && ++iterations < kMaxDisplayIterations); if (messages.GetList().size() > 0) diff --git a/net/http/http_request_headers.cc b/net/http/http_request_headers.cc index b8db53837a443c..11af6fed583228 100644 --- a/net/http/http_request_headers.cc +++ b/net/http/http_request_headers.cc @@ -193,7 +193,7 @@ base::Value HttpRequestHeaders::NetLogParams( for (auto it = headers_.begin(); it != headers_.end(); ++it) { std::string log_value = ElideHeaderValueForNetLog(capture_mode, it->key, it->value); - headers->GetList().push_back( + headers->Append( NetLogStringValue(base::StrCat({it->key, ": ", log_value}))); } dict.Set("headers", std::move(headers)); diff --git a/net/http/http_response_headers.cc b/net/http/http_response_headers.cc index 087922755a2eee..a3d39a0f98dcec 100644 --- a/net/http/http_response_headers.cc +++ b/net/http/http_response_headers.cc @@ -1334,15 +1334,14 @@ base::Value HttpResponseHeaders::NetLogParams( NetLogCaptureMode capture_mode) const { base::DictionaryValue dict; base::ListValue headers; - headers.GetList().push_back(NetLogStringValue(GetStatusLine())); + headers.Append(NetLogStringValue(GetStatusLine())); size_t iterator = 0; std::string name; std::string value; while (EnumerateHeaderLines(&iterator, &name, &value)) { std::string log_value = ElideHeaderValueForNetLog(capture_mode, name, value); - headers.GetList().push_back( - NetLogStringValue(base::StrCat({name, ": ", log_value}))); + headers.Append(NetLogStringValue(base::StrCat({name, ": ", log_value}))); } dict.SetKey("headers", std::move(headers)); return std::move(dict); diff --git a/net/http/http_server_properties_manager.cc b/net/http/http_server_properties_manager.cc index 48be29503e2e4e..12a28ac2e00e4b 100644 --- a/net/http/http_server_properties_manager.cc +++ b/net/http/http_server_properties_manager.cc @@ -724,7 +724,7 @@ void HttpServerPropertiesManager::WriteToPrefs( server_dict.SetStringKey(kServerKey, key.server.Serialize()); server_dict.SetKey(kNetworkIsolationKey, std::move(network_isolation_key_value)); - servers_list.GetList().emplace_back(std::move(server_dict)); + servers_list.Append(std::move(server_dict)); } http_server_properties_dict.SetKey(kServersKey, std::move(servers_list)); @@ -861,7 +861,7 @@ void HttpServerPropertiesManager::SaveBrokenAlternativeServicesToPrefs( } entry_dict.SetKey(kBrokenCountKey, base::Value(broken_count)); json_list_index_map[broken_alt_service] = json_list->GetList().size(); - json_list->GetList().push_back(std::move(entry_dict)); + json_list->Append(std::move(entry_dict)); } } @@ -898,7 +898,7 @@ void HttpServerPropertiesManager::SaveBrokenAlternativeServicesToPrefs( } entry_dict.SetKey(kBrokenUntilKey, base::Value(base::NumberToString(expiration_int64))); - json_list->GetList().push_back(std::move(entry_dict)); + json_list->Append(std::move(entry_dict)); } } } diff --git a/net/http/http_server_properties_manager_unittest.cc b/net/http/http_server_properties_manager_unittest.cc index 061825f9505a7b..083faeeb9de924 100644 --- a/net/http/http_server_properties_manager_unittest.cc +++ b/net/http/http_server_properties_manager_unittest.cc @@ -1042,21 +1042,20 @@ TEST_F(HttpServerPropertiesManagerTest, BadSupportsQuic) { alternative_service_dict.SetStringKey("protocol_str", "quic"); alternative_service_dict.SetIntKey("port", i); base::Value alternative_service_list(base::Value::Type::LIST); - alternative_service_list.GetList().emplace_back( - std::move(alternative_service_dict)); + alternative_service_list.Append(std::move(alternative_service_dict)); server_dict.SetKey("alternative_service", std::move(alternative_service_list)); server_dict.SetStringKey("server", StringPrintf("https://www.google.com:%d", i)); server_dict.SetKey("isolation", base::Value(base::Value::Type::LIST)); - servers_list->GetList().emplace_back(std::move(server_dict)); + servers_list->Append(std::move(server_dict)); } // Set the server preference for http://mail.google.com server. base::Value server_dict2(base::Value::Type::DICTIONARY); server_dict2.SetStringKey("server", "https://mail.google.com"); server_dict2.SetKey("isolation", base::Value(base::Value::Type::LIST)); - servers_list->GetList().emplace_back(std::move(server_dict2)); + servers_list->Append(std::move(server_dict2)); base::DictionaryValue http_server_properties_dict = DictWithVersion(); http_server_properties_dict.SetWithoutPathExpansion("servers", diff --git a/net/network_error_logging/network_error_logging_service.cc b/net/network_error_logging/network_error_logging_service.cc index 2f849ac056e994..edbc52b117117b 100644 --- a/net/network_error_logging/network_error_logging_service.cc +++ b/net/network_error_logging/network_error_logging_service.cc @@ -816,7 +816,7 @@ class NetworkErrorLoggingServiceImpl : public NetworkErrorLoggingService { base::Value cert_url_list = base::Value(base::Value::Type::LIST); if (details.cert_url.is_valid()) - cert_url_list.GetList().push_back(base::Value(details.cert_url.spec())); + cert_url_list.Append(base::Value(details.cert_url.spec())); sxg_body->SetKey(kCertUrlKey, std::move(cert_url_list)); body->SetDictionary(kSignedExchangeBodyKey, std::move(sxg_body)); diff --git a/net/proxy_resolution/dhcp_pac_file_fetcher_win.cc b/net/proxy_resolution/dhcp_pac_file_fetcher_win.cc index bfa94fbc535315..b8ca8659b87eaf 100644 --- a/net/proxy_resolution/dhcp_pac_file_fetcher_win.cc +++ b/net/proxy_resolution/dhcp_pac_file_fetcher_win.cc @@ -223,7 +223,7 @@ base::Value NetLogGetAdaptersDoneParams(DhcpAdapterNamesLoggingInfo* info) { bool skipped = !IsDhcpCapableAdapter(adapter); adapter_value.SetKey("skipped", base::Value(skipped)); - adapters_value.GetList().push_back(std::move(adapter_value)); + adapters_value.Append(std::move(adapter_value)); } result.SetKey("adapters", std::move(adapters_value)); diff --git a/net/proxy_resolution/proxy_config.cc b/net/proxy_resolution/proxy_config.cc index 3b08998cd9e9aa..94ae3864b60200 100644 --- a/net/proxy_resolution/proxy_config.cc +++ b/net/proxy_resolution/proxy_config.cc @@ -250,7 +250,7 @@ base::Value ProxyConfig::ToValue() const { base::Value list(base::Value::Type::LIST); for (const auto& bypass_rule : bypass.rules()) - list.GetList().emplace_back(bypass_rule->ToString()); + list.Append(bypass_rule->ToString()); dict.SetKey("bypass_list", std::move(list)); } diff --git a/net/proxy_resolution/proxy_list.cc b/net/proxy_resolution/proxy_list.cc index eb7b7d8800a05e..609eb43c4c21ee 100644 --- a/net/proxy_resolution/proxy_list.cc +++ b/net/proxy_resolution/proxy_list.cc @@ -145,7 +145,7 @@ std::string ProxyList::ToPacString() const { base::Value ProxyList::ToValue() const { base::Value list(base::Value::Type::LIST); for (const auto& proxy : proxies_) - list.GetList().emplace_back(proxy.ToURI()); + list.Append(proxy.ToURI()); return list; } diff --git a/net/proxy_resolution/proxy_resolution_service.cc b/net/proxy_resolution/proxy_resolution_service.cc index bea9e508fcf565..3c92a4b6aabae4 100644 --- a/net/proxy_resolution/proxy_resolution_service.cc +++ b/net/proxy_resolution/proxy_resolution_service.cc @@ -331,7 +331,7 @@ base::Value NetLogBadProxyListParams(const ProxyRetryInfoMap* retry_info) { base::Value list(base::Value::Type::LIST); for (const auto& retry_info_pair : *retry_info) - list.GetList().emplace_back(retry_info_pair.first); + list.Append(retry_info_pair.first); dict.SetKey("bad_proxy_list", std::move(list)); return dict; } diff --git a/net/quic/quic_connection_logger.cc b/net/quic/quic_connection_logger.cc index b83bbdea171035..34109ffedf8e96 100644 --- a/net/quic/quic_connection_logger.cc +++ b/net/quic/quic_connection_logger.cc @@ -121,7 +121,7 @@ base::Value NetLogQuicAckFrameParams(const quic::QuicAckFrame* frame) { for (quic::QuicPacketNumber packet = frame->packets.Min(); packet < frame->largest_acked; ++packet) { if (!frame->packets.Contains(packet)) { - missing->GetList().push_back(NetLogNumberValue(packet.ToUint64())); + missing->Append(NetLogNumberValue(packet.ToUint64())); } } } @@ -237,7 +237,7 @@ base::Value NetLogQuicCertificateVerifiedParams( base::DictionaryValue dict; auto subjects = std::make_unique(); for (auto& dns_name : dns_names) { - subjects->GetList().emplace_back(std::move(dns_name)); + subjects->Append(std::move(dns_name)); } dict.Set("subjects", std::move(subjects)); return std::move(dict); diff --git a/net/quic/quic_stream_factory.cc b/net/quic/quic_stream_factory.cc index 96ee77da5f1095..5962c610d8a82c 100644 --- a/net/quic/quic_stream_factory.cc +++ b/net/quic/quic_stream_factory.cc @@ -1613,7 +1613,7 @@ std::unique_ptr QuicStreamFactory::QuicStreamFactoryInfoToValue() hosts.insert(HostPortPair(alias_it->server_id().host(), alias_it->server_id().port())); } - list->GetList().push_back(session->GetInfoAsValue(hosts)); + list->Append(session->GetInfoAsValue(hosts)); } } return std::move(list); diff --git a/net/socket/client_socket_pool_manager_impl.cc b/net/socket/client_socket_pool_manager_impl.cc index fd85bfc0ee5c03..e76c198010f737 100644 --- a/net/socket/client_socket_pool_manager_impl.cc +++ b/net/socket/client_socket_pool_manager_impl.cc @@ -101,7 +101,7 @@ ClientSocketPoolManagerImpl::SocketPoolInfoToValue() const { } else { type = "http_proxy_socket_pool"; } - list->GetList().push_back( + list->Append( socket_pool.second->GetInfoAsValue(socket_pool.first.ToURI(), type)); } diff --git a/net/spdy/spdy_log_util.cc b/net/spdy/spdy_log_util.cc index fe85d2f016cc9a..833d0f469adb08 100644 --- a/net/spdy/spdy_log_util.cc +++ b/net/spdy/spdy_log_util.cc @@ -30,7 +30,7 @@ base::ListValue ElideSpdyHeaderBlockForNetLog( for (const auto& header : headers) { base::StringPiece key = header.first; base::StringPiece value = header.second; - headers_list.GetList().push_back(NetLogStringValue( + headers_list.Append(NetLogStringValue( base::StrCat({key, ": ", ElideHeaderValueForNetLog(capture_mode, key.as_string(), value.as_string())}))); diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc index af745dde692f88..fe3414cba9dab4 100644 --- a/net/spdy/spdy_session.cc +++ b/net/spdy/spdy_session.cc @@ -1427,7 +1427,7 @@ base::Value SpdySession::GetInfoAsValue() const { if (!pooled_aliases_.empty()) { base::Value alias_list(base::Value::Type::LIST); for (const auto& alias : pooled_aliases_) { - alias_list.GetList().emplace_back(alias.host_port_pair().ToString()); + alias_list.Append(alias.host_port_pair().ToString()); } dict.SetKey("aliases", std::move(alias_list)); } diff --git a/net/spdy/spdy_session_pool.cc b/net/spdy/spdy_session_pool.cc index feeee871920a95..c742892f34f0fe 100644 --- a/net/spdy/spdy_session_pool.cc +++ b/net/spdy/spdy_session_pool.cc @@ -446,7 +446,7 @@ std::unique_ptr SpdySessionPool::SpdySessionPoolInfoToValue() const SpdySessionKey& key = it->first; const SpdySessionKey& session_key = it->second->spdy_session_key(); if (key == session_key) - list->GetList().push_back(it->second->GetInfoAsValue()); + list->Append(it->second->GetInfoAsValue()); } return std::move(list); } diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc index c31d4c30bd268c..4acd648a14ba1b 100644 --- a/net/url_request/url_request.cc +++ b/net/url_request/url_request.cc @@ -280,7 +280,7 @@ base::Value URLRequest::GetStateAsValue() const { if (url_chain_.size() > 1) { base::Value list(base::Value::Type::LIST); for (const GURL& url : url_chain_) { - list.GetList().emplace_back(url.possibly_invalid_spec()); + list.Append(url.possibly_invalid_spec()); } dict.SetKey("url_chain", std::move(list)); }