From 9c98d67d7ad21af7175bf016cad251fd553dc2a5 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Thu, 29 Sep 2022 06:45:17 -0700 Subject: [PATCH] [c++14] absl::make_unique --> std::make_unique (#31159) * [c++14] absl::make_unique --> std::make_unique * fix * fix --- BUILD | 55 +--------------- .../filters/client_channel/client_channel.cc | 11 ++-- .../health/health_check_client.cc | 7 +-- .../lb_policy/address_filtering.cc | 7 +-- .../client_channel/lb_policy/grpclb/grpclb.cc | 21 +++---- .../lb_policy/grpclb/grpclb_client_stats.cc | 4 +- .../lb_policy/oob_backend_metric.cc | 5 +- .../lb_policy/oob_backend_metric.h | 2 +- .../outlier_detection/outlier_detection.cc | 15 +++-- .../lb_policy/pick_first/pick_first.cc | 19 +++--- .../lb_policy/priority/priority.cc | 11 ++-- .../lb_policy/ring_hash/ring_hash.cc | 7 +-- .../client_channel/lb_policy/rls/rls.cc | 13 ++-- .../lb_policy/round_robin/round_robin.cc | 15 +++-- .../weighted_target/weighted_target.cc | 13 ++-- .../client_channel/lb_policy/xds/cds.cc | 9 ++- .../client_channel/lb_policy/xds/xds.h | 4 +- .../lb_policy/xds/xds_cluster_impl.cc | 11 ++-- .../lb_policy/xds/xds_cluster_manager.cc | 9 ++- .../lb_policy/xds/xds_cluster_resolver.cc | 13 ++-- .../resolver/binder/binder_resolver.cc | 3 +- .../resolver/dns/c_ares/dns_resolver_ares.cc | 6 +- .../dns/c_ares/grpc_ares_ev_driver_posix.cc | 3 +- .../dns/c_ares/grpc_ares_ev_driver_windows.cc | 2 +- .../resolver/dns/c_ares/grpc_ares_wrapper.cc | 7 +-- .../resolver/dns/native/dns_resolver.cc | 5 +- .../resolver/fake/fake_resolver.cc | 3 +- .../google_c2p/google_c2p_resolver.cc | 5 +- .../resolver/sockaddr/sockaddr_resolver.cc | 9 ++- .../resolver/xds/xds_resolver.cc | 3 +- .../client_channel/resolver_result_parsing.cc | 9 ++- .../client_channel/retry_service_config.cc | 9 ++- .../fault_injection/service_config_parser.cc | 5 +- .../message_size/message_size_filter.cc | 7 +-- .../rbac/rbac_service_config_parser.cc | 13 ++-- .../server_config_selector_filter.cc | 3 +- .../binder/client/endpoint_binder_pool.cc | 2 +- .../server/binder_server_credentials.cc | 2 +- .../binder/transport/binder_transport.cc | 5 +- .../binder/wire_format/binder_android.cc | 8 +-- .../binder/wire_format/binder_android.h | 2 +- .../transport/chttp2/server/chttp2_server.cc | 3 +- ...le_watcher_certificate_provider_factory.cc | 3 +- src/core/ext/xds/xds_bootstrap_grpc.cc | 3 +- src/core/ext/xds/xds_certificate_provider.cc | 29 +++++---- src/core/ext/xds/xds_client.cc | 5 +- src/core/ext/xds/xds_cluster.cc | 3 +- .../ext/xds/xds_cluster_specifier_plugin.cc | 3 +- src/core/ext/xds/xds_endpoint.cc | 5 +- src/core/ext/xds/xds_http_filters.cc | 9 ++- src/core/ext/xds/xds_lb_policy_registry.cc | 7 +-- src/core/ext/xds/xds_listener.cc | 3 +- src/core/ext/xds/xds_route_config.cc | 9 ++- src/core/lib/channel/promise_based_filter.cc | 5 +- .../default_event_engine_factory.cc | 6 +- .../posix_engine/ev_epoll1_linux.cc | 8 +-- .../posix_engine/timer_manager.cc | 3 +- .../posix_engine/wakeup_fd_eventfd.cc | 3 +- .../posix_engine/wakeup_fd_pipe.cc | 3 +- src/core/lib/iomgr/iomgr_posix.cc | 3 +- src/core/lib/iomgr/iomgr_posix_cfstream.cc | 3 +- src/core/lib/iomgr/iomgr_windows.cc | 3 +- src/core/lib/matchers/matchers.cc | 7 +-- src/core/lib/resolver/server_address.h | 4 +- .../authorization/cel_authorization_engine.cc | 3 +- .../grpc_authorization_engine.cc | 4 +- .../grpc_authorization_policy_provider.cc | 4 +- .../lib/security/authorization/matchers.cc | 43 +++++++------ .../mock_cel/cel_expr_builder_factory.h | 4 +- .../authorization/mock_cel/cel_value.h | 3 +- .../mock_cel/flat_expr_builder.h | 9 ++- .../lib/security/authorization/rbac_policy.cc | 5 +- .../security/authorization/rbac_translator.cc | 15 +++-- .../channel_creds_registry_init.cc | 7 +-- .../aws_external_account_credentials.cc | 3 +- .../tls/tls_security_connector.cc | 5 +- .../security/transport/security_handshaker.cc | 5 +- .../lib/service_config/service_config_impl.cc | 3 +- src/core/lib/surface/lame_client.cc | 3 +- src/core/lib/surface/server.cc | 15 +++-- src/core/lib/surface/server.h | 3 +- .../lib/transport/http_connect_handshaker.cc | 3 +- .../lib/transport/tcp_connect_handshaker.cc | 3 +- .../session_cache/ssl_session_boringssl.cc | 2 +- .../ssl/session_cache/ssl_session_openssl.cc | 2 +- src/cpp/common/alts_util.cc | 3 +- .../health/default_health_check_service.cc | 3 +- .../load_reporter_async_service_impl.cc | 12 ++-- src/cpp/server/orca/orca_interceptor.cc | 3 +- src/cpp/server/server_cc.cc | 9 ++- test/core/channel/channelz_test.cc | 4 +- .../resolvers/binder_resolver_test.cc | 5 +- .../resolvers/dns_resolver_cooldown_test.cc | 2 +- .../resolvers/dns_resolver_test.cc | 4 +- .../resolvers/sockaddr_resolver_test.cc | 4 +- .../client_channel/service_config_test.cc | 20 +++--- test/core/end2end/BUILD | 2 - test/core/end2end/fuzzers/api_fuzzer.cc | 7 +-- test/core/end2end/goaway_server_test.cc | 5 +- .../end2end/invalid_call_argument_test.cc | 4 +- test/core/end2end/tests/max_connection_age.cc | 6 +- test/core/end2end/tests/retry_lb_drop.cc | 5 +- test/core/end2end/tests/server_streaming.cc | 4 +- .../default_engine_methods_test.cc | 2 +- test/core/event_engine/factory_test.cc | 4 +- .../posix/event_poller_posix_test.cc | 4 +- .../event_engine/test_suite/client_test.cc | 10 +-- .../test_suite/event_engine_test_utils.cc | 2 +- .../test_suite/fuzzing_event_engine_test.cc | 2 +- .../test_suite/oracle_event_engine_posix.cc | 4 +- .../oracle_event_engine_posix_test.cc | 2 +- .../test_suite/posix_event_engine_test.cc | 2 +- .../test_suite/windows_event_engine_test.cc | 2 +- test/core/filters/filter_fuzzer.cc | 8 +-- test/core/gprpp/work_serializer_test.cc | 8 +-- .../readahead_handshaker_server_ssl.cc | 2 +- test/core/iomgr/stranded_event_test.cc | 4 +- test/core/promise/for_each_test.cc | 3 +- test/core/promise/pipe_test.cc | 5 +- test/core/resource_quota/BUILD | 6 +- test/core/resource_quota/arena_test.cc | 5 +- .../resource_quota/periodic_update_test.cc | 5 +- .../security/authorization_matchers_test.cc | 54 ++++++++-------- .../security/channel_creds_registry_test.cc | 2 +- ...grpc_authorization_policy_provider_test.cc | 10 +-- .../grpc_tls_certificate_distributor_test.cc | 2 +- .../grpc_tls_certificate_provider_test.cc | 14 ++--- .../grpc_tls_credentials_options_test.cc | 6 +- test/core/slice/slice_test.cc | 2 +- .../transport/binder/binder_transport_test.cc | 4 +- .../binder/end2end/binder_server_test.cc | 8 +-- .../end2end/end2end_binder_transport_test.cc | 2 +- .../transport/binder/end2end/fake_binder.cc | 18 +++--- .../transport/binder/end2end/fake_binder.h | 2 +- .../binder/end2end/fake_binder_test.cc | 2 +- .../binder/end2end/fuzzers/client_fuzzer.cc | 2 +- .../binder/end2end/fuzzers/fuzzer_utils.cc | 8 +-- .../binder/end2end/fuzzers/fuzzer_utils.h | 4 +- .../binder/end2end/fuzzers/server_fuzzer.cc | 2 +- .../binder/end2end/testing_channel_create.cc | 2 +- .../binder/endpoint_binder_pool_test.cc | 6 +- test/core/transport/binder/mock_objects.cc | 4 +- .../binder/transport_stream_receiver_test.cc | 6 +- .../core/transport/binder/wire_reader_test.cc | 4 +- .../core/transport/binder/wire_writer_test.cc | 2 +- .../transport/chttp2/flow_control_fuzzer.cc | 5 +- .../chttp2/graceful_shutdown_test.cc | 5 +- .../transport/chttp2/hpack_parser_test.cc | 3 +- .../remove_stream_from_stalled_lists_test.cc | 4 +- .../transport/chttp2/settings_timeout_test.cc | 3 +- .../transport/chttp2/streams_not_seen_test.cc | 5 +- test/core/transport/parsed_metadata_test.cc | 9 ++- .../alts_concurrent_connectivity_test.cc | 12 ++-- test/core/util/BUILD | 2 - test/core/util/fake_udp_and_tcp_server.cc | 5 +- test/core/util/test_lb_policies.cc | 37 ++++++----- .../xds/certificate_provider_store_test.cc | 2 +- test/core/xds/xds_bootstrap_test.cc | 2 +- test/core/xds/xds_client_test.cc | 4 +- test/core/xds/xds_lb_policy_registry_test.cc | 2 +- test/cpp/client/client_channel_stress_test.cc | 2 +- test/cpp/end2end/async_end2end_test.cc | 3 +- test/cpp/end2end/channelz_service_test.cc | 2 +- .../end2end/client_callback_end2end_test.cc | 16 ++--- test/cpp/end2end/client_crash_test.cc | 2 +- .../client_interceptors_end2end_test.cc | 62 +++++++++---------- test/cpp/end2end/client_lb_end2end_test.cc | 6 +- .../end2end/connection_attempt_injector.cc | 4 +- test/cpp/end2end/end2end_test.cc | 8 +-- test/cpp/end2end/filter_end2end_test.cc | 2 +- test/cpp/end2end/flaky_network_test.cc | 6 +- test/cpp/end2end/generic_end2end_test.cc | 2 +- test/cpp/end2end/grpclb_end2end_test.cc | 2 +- test/cpp/end2end/interceptors_util.cc | 2 +- test/cpp/end2end/nonblocking_test.cc | 3 +- .../end2end/proto_server_reflection_test.cc | 4 +- test/cpp/end2end/rls_end2end_test.cc | 8 +-- .../cpp/end2end/server_builder_plugin_test.cc | 2 +- test/cpp/end2end/server_crash_test.cc | 2 +- .../server_interceptors_end2end_test.cc | 16 ++--- .../end2end/service_config_end2end_test.cc | 2 +- test/cpp/end2end/time_change_test.cc | 2 +- test/cpp/end2end/xds/xds_csds_end2end_test.cc | 2 +- test/cpp/end2end/xds/xds_end2end_test.cc | 12 ++-- test/cpp/end2end/xds/xds_end2end_test_lib.cc | 6 +- test/cpp/end2end/xds/xds_rls_end2end_test.cc | 2 +- .../end2end/xds/xds_routing_end2end_test.cc | 6 +- test/cpp/naming/resolver_component_test.cc | 2 +- test/cpp/qps/client.h | 4 +- test/cpp/qps/client_async.cc | 10 +-- test/cpp/qps/client_callback.cc | 8 +-- test/cpp/qps/qps_server_builder.cc | 2 +- test/cpp/qps/qps_worker.cc | 2 +- .../authorization_policy_provider_test.cc | 4 +- .../load_reporter/load_reporter_test.cc | 2 +- test/cpp/test/mock_stream_test.cc | 20 +++--- test/cpp/util/byte_buffer_proto_helper.cc | 2 +- test/cpp/util/grpc_tool.cc | 4 +- test/cpp/util/proto_file_parser.cc | 12 ++-- .../codegen/core/gen_huffman_decompressor.cc | 12 ++-- .../run_tests/sanity/core_banned_functions.py | 4 +- 201 files changed, 591 insertions(+), 767 deletions(-) diff --git a/BUILD b/BUILD index a00b98243a3..f7171059fab 100644 --- a/BUILD +++ b/BUILD @@ -910,10 +910,7 @@ grpc_cc_library( "include/grpcpp/security/alts_context.h", "include/grpcpp/security/alts_util.h", ], - external_deps = [ - "absl/memory", - "upb_lib", - ], + external_deps = ["upb_lib"], language = "c++", standalone = True, visibility = ["@grpc:tsi"], @@ -1902,7 +1899,6 @@ grpc_cc_library( ], external_deps = [ "absl/base:core_headers", - "absl/memory", "absl/status", "absl/strings", "absl/types:optional", @@ -1938,7 +1934,6 @@ grpc_cc_library( ], external_deps = [ "absl/base:core_headers", - "absl/memory", "absl/status", "absl/status:statusor", "absl/strings", @@ -2535,7 +2530,6 @@ grpc_cc_library( ], external_deps = [ "absl/base:core_headers", - "absl/memory", "absl/time", "absl/types:optional", ], @@ -2620,7 +2614,6 @@ grpc_cc_library( "src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.h", ], external_deps = [ - "absl/memory", "absl/status", "absl/status:statusor", "absl/strings", @@ -2641,7 +2634,6 @@ grpc_cc_library( "src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.h", ], external_deps = [ - "absl/memory", "absl/status", "absl/status:statusor", "absl/strings", @@ -2686,7 +2678,6 @@ grpc_cc_library( "absl/base:core_headers", "absl/container:inlined_vector", "absl/functional:function_ref", - "absl/memory", "absl/status", "absl/status:statusor", "absl/strings", @@ -3365,7 +3356,6 @@ grpc_cc_library( "absl/container:inlined_vector", "absl/functional:any_invocable", "absl/functional:function_ref", - "absl/memory", "absl/meta:type_traits", "absl/status", "absl/status:statusor", @@ -3584,7 +3574,6 @@ grpc_cc_library( "src/core/lib/service_config/service_config_impl.h", ], external_deps = [ - "absl/memory", "absl/status", "absl/status:statusor", "absl/strings", @@ -3634,7 +3623,6 @@ grpc_cc_library( "src/core/lib/resolver/server_address.h", ], external_deps = [ - "absl/memory", "absl/status", "absl/status:statusor", "absl/strings", @@ -3899,7 +3887,6 @@ grpc_cc_library( external_deps = [ "absl/base:core_headers", "absl/container:inlined_vector", - "absl/memory", "absl/status", "absl/status:statusor", "absl/strings", @@ -4006,7 +3993,6 @@ grpc_cc_library( ], external_deps = [ "absl/base:core_headers", - "absl/memory", "absl/status", "absl/status:statusor", "absl/types:optional", @@ -4164,7 +4150,6 @@ grpc_cc_library( "src/core/ext/filters/message_size/message_size_filter.h", ], external_deps = [ - "absl/memory", "absl/status", "absl/status:statusor", "absl/strings", @@ -4203,7 +4188,6 @@ grpc_cc_library( ], external_deps = [ "absl/base:core_headers", - "absl/memory", "absl/random", "absl/status", "absl/status:statusor", @@ -4241,7 +4225,6 @@ grpc_cc_library( "src/core/ext/filters/rbac/rbac_service_config_parser.h", ], external_deps = [ - "absl/memory", "absl/status", "absl/status:statusor", "absl/strings", @@ -4358,7 +4341,6 @@ grpc_cc_library( external_deps = [ "absl/base:core_headers", "absl/container:inlined_vector", - "absl/memory", "absl/status", "absl/status:statusor", "absl/strings", @@ -4433,7 +4415,6 @@ grpc_cc_library( external_deps = [ "absl/base:core_headers", "absl/hash", - "absl/memory", "absl/status", "absl/status:statusor", "absl/strings", @@ -4830,10 +4811,7 @@ grpc_cc_library( srcs = [ "src/core/lib/security/credentials/channel_creds_registry_init.cc", ], - external_deps = [ - "absl/memory", - "absl/strings", - ], + external_deps = ["absl/strings"], language = "c++", deps = [ "channel_creds_registry", @@ -4875,7 +4853,6 @@ grpc_cc_library( "src/core/ext/filters/client_channel/lb_policy/xds/cds.cc", ], external_deps = [ - "absl/memory", "absl/status", "absl/status:statusor", "absl/strings", @@ -4925,7 +4902,6 @@ grpc_cc_library( hdrs = [ "src/core/ext/filters/client_channel/lb_policy/xds/xds.h", ], - external_deps = ["absl/memory"], language = "c++", deps = [ "gpr_platform", @@ -4941,7 +4917,6 @@ grpc_cc_library( "src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_resolver.cc", ], external_deps = [ - "absl/memory", "absl/status", "absl/status:statusor", "absl/strings", @@ -4989,7 +4964,6 @@ grpc_cc_library( ], external_deps = [ "absl/base:core_headers", - "absl/memory", "absl/status", "absl/status:statusor", "absl/strings", @@ -5032,7 +5006,6 @@ grpc_cc_library( "src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_manager.cc", ], external_deps = [ - "absl/memory", "absl/status", "absl/status:statusor", "absl/strings", @@ -5078,7 +5051,6 @@ grpc_cc_library( "src/core/ext/filters/client_channel/lb_policy/address_filtering.h", ], external_deps = [ - "absl/memory", "absl/status:statusor", "absl/strings", ], @@ -5120,7 +5092,6 @@ grpc_cc_library( "src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc", ], external_deps = [ - "absl/memory", "absl/status", "absl/status:statusor", "absl/strings", @@ -5158,7 +5129,6 @@ grpc_cc_library( external_deps = [ "absl/base:core_headers", "absl/container:inlined_vector", - "absl/memory", "absl/status", "absl/status:statusor", "absl/strings", @@ -5200,7 +5170,6 @@ grpc_cc_library( "src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc", ], external_deps = [ - "absl/memory", "absl/status", "absl/status:statusor", "absl/strings", @@ -5249,7 +5218,6 @@ grpc_cc_library( "src/core/ext/filters/client_channel/lb_policy/outlier_detection/outlier_detection.cc", ], external_deps = [ - "absl/memory", "absl/random", "absl/status", "absl/status:statusor", @@ -5293,7 +5261,6 @@ grpc_cc_library( "src/core/ext/filters/client_channel/lb_policy/priority/priority.cc", ], external_deps = [ - "absl/memory", "absl/status", "absl/status:statusor", "absl/strings", @@ -5336,7 +5303,6 @@ grpc_cc_library( "src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc", ], external_deps = [ - "absl/memory", "absl/status", "absl/status:statusor", "absl/strings", @@ -5588,7 +5554,6 @@ grpc_cc_library( ], external_deps = [ "absl/functional:bind_front", - "absl/memory", "absl/status", "absl/status:statusor", "absl/strings", @@ -5632,7 +5597,6 @@ grpc_cc_library( external_deps = [ "absl/base:core_headers", "absl/container:flat_hash_set", - "absl/memory", "absl/status", "absl/status:statusor", "absl/strings", @@ -5680,7 +5644,6 @@ grpc_cc_library( "src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc", ], external_deps = [ - "absl/memory", "absl/status:statusor", "absl/strings", ], @@ -5704,7 +5667,6 @@ grpc_cc_library( "src/core/ext/filters/client_channel/resolver/binder/binder_resolver.cc", ], external_deps = [ - "absl/memory", "absl/status", "absl/status:statusor", "absl/strings", @@ -5729,7 +5691,6 @@ grpc_cc_library( hdrs = ["src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h"], external_deps = [ "absl/base:core_headers", - "absl/memory", "absl/status", "absl/status:statusor", "absl/strings", @@ -5775,7 +5736,6 @@ grpc_cc_library( "src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc", ], external_deps = [ - "absl/memory", "absl/meta:type_traits", "absl/random", "absl/status", @@ -5824,7 +5784,6 @@ grpc_cc_library( "src/core/ext/filters/client_channel/resolver/google_c2p/google_c2p_resolver.cc", ], external_deps = [ - "absl/memory", "absl/status", "absl/status:statusor", "absl/strings", @@ -6229,7 +6188,6 @@ grpc_cc_library( "absl/base:core_headers", "absl/container:inlined_vector", "absl/functional:bind_front", - "absl/memory", "absl/status", "absl/status:statusor", "absl/strings", @@ -6400,7 +6358,6 @@ grpc_cc_library( "src/core/lib/security/credentials/external/url_external_account_credentials.h", ], external_deps = [ - "absl/memory", "absl/status", "absl/status:statusor", "absl/strings", @@ -6500,7 +6457,6 @@ grpc_cc_library( external_deps = [ "absl/base:core_headers", "absl/container:inlined_vector", - "absl/memory", "absl/status", "absl/status:statusor", "absl/strings", @@ -6714,7 +6670,6 @@ grpc_cc_library( "src/core/lib/security/authorization/mock_cel/flat_expr_builder.h", ], external_deps = [ - "absl/memory", "absl/status", "absl/status:statusor", "absl/strings", @@ -6737,7 +6692,6 @@ grpc_cc_library( "src/core/lib/matchers/matchers.h", ], external_deps = [ - "absl/memory", "absl/status", "absl/status:statusor", "absl/strings", @@ -6763,7 +6717,6 @@ grpc_cc_library( "src/core/lib/security/authorization/rbac_policy.h", ], external_deps = [ - "absl/memory", "absl/status", "absl/status:statusor", "absl/strings", @@ -6794,7 +6747,6 @@ grpc_cc_library( ], external_deps = [ "absl/base:core_headers", - "absl/memory", "absl/status", "absl/status:statusor", "absl/strings", @@ -6848,7 +6800,6 @@ grpc_cc_library( ], external_deps = [ "absl/container:flat_hash_set", - "absl/memory", "absl/strings", "absl/types:optional", "absl/types:span", @@ -7112,7 +7063,6 @@ grpc_cc_library( ], external_deps = [ "absl/base:core_headers", - "absl/memory", "absl/status", "absl/status:statusor", "absl/strings", @@ -7466,7 +7416,6 @@ grpc_cc_library( "src/cpp/server/orca/orca_interceptor.h", ], external_deps = [ - "absl/memory", "absl/strings", "absl/types:optional", ], diff --git a/src/core/ext/filters/client_channel/client_channel.cc b/src/core/ext/filters/client_channel/client_channel.cc index cc9f78dfc57..30948c3bbaf 100644 --- a/src/core/ext/filters/client_channel/client_channel.cc +++ b/src/core/ext/filters/client_channel/client_channel.cc @@ -27,7 +27,6 @@ #include #include -#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/cord.h" @@ -1328,7 +1327,7 @@ void ClientChannel::OnResolverErrorLocked(absl::Status status) { // Update connectivity state. UpdateStateAndPickerLocked( GRPC_CHANNEL_TRANSIENT_FAILURE, status, "resolver failure", - absl::make_unique(status)); + std::make_unique(status)); } } @@ -1368,7 +1367,7 @@ OrphanablePtr ClientChannel::CreateLbPolicyLocked( LoadBalancingPolicy::Args lb_policy_args; lb_policy_args.work_serializer = work_serializer_; lb_policy_args.channel_control_helper = - absl::make_unique(this); + std::make_unique(this); lb_policy_args.args = args; OrphanablePtr lb_policy = MakeOrphanable(std::move(lb_policy_args), @@ -1502,13 +1501,13 @@ void ClientChannel::CreateResolverLocked() { } resolver_ = CoreConfiguration::Get().resolver_registry().CreateResolver( uri_to_resolve_.c_str(), channel_args_, interested_parties_, - work_serializer_, absl::make_unique(this)); + work_serializer_, std::make_unique(this)); // Since the validity of the args was checked when the channel was created, // CreateResolver() must return a non-null result. GPR_ASSERT(resolver_ != nullptr); UpdateStateAndPickerLocked( GRPC_CHANNEL_CONNECTING, absl::Status(), "started resolving", - absl::make_unique(nullptr)); + std::make_unique(nullptr)); resolver_->StartLocked(); if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_trace)) { gpr_log(GPR_INFO, "chand=%p: created resolver=%p", this, resolver_.get()); @@ -1714,7 +1713,7 @@ void ClientChannel::StartTransportOpLocked(grpc_transport_op* op) { disconnect_error_ = op->disconnect_with_error; UpdateStateAndPickerLocked( GRPC_CHANNEL_SHUTDOWN, absl::Status(), "shutdown from API", - absl::make_unique( + std::make_unique( grpc_error_to_absl_status(op->disconnect_with_error))); } } diff --git a/src/core/ext/filters/client_channel/health/health_check_client.cc b/src/core/ext/filters/client_channel/health/health_check_client.cc index 8b18b5c7032..6617a1b37db 100644 --- a/src/core/ext/filters/client_channel/health/health_check_client.cc +++ b/src/core/ext/filters/client_channel/health/health_check_client.cc @@ -25,7 +25,6 @@ #include #include -#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/string_view.h" @@ -165,9 +164,9 @@ OrphanablePtr MakeHealthCheckClient( RefCountedPtr watcher) { return MakeOrphanable( std::move(connected_subchannel), interested_parties, - absl::make_unique(std::move(service_name), - std::move(channelz_node), - std::move(watcher)), + std::make_unique(std::move(service_name), + std::move(channelz_node), + std::move(watcher)), GRPC_TRACE_FLAG_ENABLED(grpc_health_check_client_trace) ? "HealthCheckClient" : nullptr); diff --git a/src/core/ext/filters/client_channel/lb_policy/address_filtering.cc b/src/core/ext/filters/client_channel/lb_policy/address_filtering.cc index 1e39e77cb49..e7893d6ff56 100644 --- a/src/core/ext/filters/client_channel/lb_policy/address_filtering.cc +++ b/src/core/ext/filters/client_channel/lb_policy/address_filtering.cc @@ -23,7 +23,6 @@ #include #include -#include "absl/memory/memory.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_join.h" @@ -41,7 +40,7 @@ class HierarchicalPathAttribute : public ServerAddress::AttributeInterface { : path_(std::move(path)) {} std::unique_ptr Copy() const override { - return absl::make_unique(path_); + return std::make_unique(path_); } int Cmp(const AttributeInterface* other) const override { @@ -70,7 +69,7 @@ class HierarchicalPathAttribute : public ServerAddress::AttributeInterface { std::unique_ptr MakeHierarchicalPathAttribute(std::vector path) { - return absl::make_unique(std::move(path)); + return std::make_unique(std::move(path)); } absl::StatusOr MakeHierarchicalAddressMap( @@ -89,7 +88,7 @@ absl::StatusOr MakeHierarchicalAddressMap( ++it; if (it != path.end()) { std::vector remaining_path(it, path.end()); - new_attribute = absl::make_unique( + new_attribute = std::make_unique( std::move(remaining_path)); } target_list.emplace_back(address.WithAttribute( diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc index fbdb4a4816b..54cf9d4ea9f 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc @@ -69,7 +69,6 @@ #include #include "absl/container/inlined_vector.h" -#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" @@ -340,8 +339,8 @@ class GrpcLb : public LoadBalancingPolicy { client_stats_(std::move(client_stats)) {} std::unique_ptr Copy() const override { - return absl::make_unique(lb_token_, - client_stats_); + return std::make_unique(lb_token_, + client_stats_); } int Cmp(const AttributeInterface* other_base) const override { @@ -707,8 +706,8 @@ ServerAddressList GrpcLb::Serverlist::GetServerAddressList( std::map> attributes; attributes[kGrpcLbAddressAttributeKey] = - absl::make_unique(std::move(lb_token), - stats); + std::make_unique(std::move(lb_token), + stats); // Add address. addresses.emplace_back(addr, ChannelArgs(), std::move(attributes)); } @@ -762,7 +761,7 @@ GrpcLb::PickResult GrpcLb::Picker::Pick(PickArgs args) { GrpcLbClientStats* client_stats = subchannel_wrapper->client_stats(); if (client_stats != nullptr) { complete_pick->subchannel_call_tracker = - absl::make_unique( + std::make_unique( client_stats->Ref(), std::move(complete_pick->subchannel_call_tracker)); // The metadata value is a hack: we pretend the pointer points to @@ -852,8 +851,8 @@ void GrpcLb::Helper::UpdateState(grpc_connectivity_state state, } parent_->channel_control_helper()->UpdateState( state, status, - absl::make_unique(std::move(serverlist), std::move(picker), - std::move(client_stats))); + std::make_unique(std::move(serverlist), std::move(picker), + std::move(client_stats))); } void GrpcLb::Helper::RequestReresolution() { @@ -1566,7 +1565,7 @@ absl::Status GrpcLb::UpdateLocked(UpdateArgs args) { for (ServerAddress& address : *fallback_backend_addresses_) { address = address.WithAttribute( kGrpcLbAddressAttributeKey, - absl::make_unique("", nullptr)); + std::make_unique("", nullptr)); } } resolution_note_ = std::move(args.resolution_note); @@ -1777,7 +1776,7 @@ OrphanablePtr GrpcLb::CreateChildPolicyLocked( LoadBalancingPolicy::Args lb_policy_args; lb_policy_args.work_serializer = work_serializer(); lb_policy_args.args = args; - lb_policy_args.channel_control_helper = absl::make_unique(Ref()); + lb_policy_args.channel_control_helper = std::make_unique(Ref()); OrphanablePtr lb_policy = MakeOrphanable(std::move(lb_policy_args), &grpc_lb_glb_trace); @@ -1912,7 +1911,7 @@ class GrpcLbFactory : public LoadBalancingPolicyFactory { namespace grpc_core { void RegisterGrpcLbPolicy(CoreConfiguration::Builder* builder) { builder->lb_policy_registry()->RegisterLoadBalancingPolicyFactory( - absl::make_unique()); + std::make_unique()); builder->channel_init()->RegisterStage( GRPC_CLIENT_SUBCHANNEL, GRPC_CHANNEL_INIT_BUILTIN_PRIORITY, [](ChannelStackBuilder* builder) { diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc index bf25138e2f0..9427a99b0b1 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc @@ -22,8 +22,6 @@ #include -#include "absl/memory/memory.h" - #include #include @@ -54,7 +52,7 @@ void GrpcLbClientStats::AddCallDropped(const char* token) { // Record the drop. MutexLock lock(&drop_count_mu_); if (drop_token_counts_ == nullptr) { - drop_token_counts_ = absl::make_unique(); + drop_token_counts_ = std::make_unique(); } for (size_t i = 0; i < drop_token_counts_->size(); ++i) { if (strcmp((*drop_token_counts_)[i].token.get(), token) == 0) { diff --git a/src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.cc b/src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.cc index fbb33d88f1f..04634390409 100644 --- a/src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.cc +++ b/src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.cc @@ -27,7 +27,6 @@ #include #include "absl/base/thread_annotations.h" -#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" @@ -348,7 +347,7 @@ void OrcaProducer::MaybeStartStreamLocked() { if (connected_subchannel_ == nullptr) return; stream_client_ = MakeOrphanable( connected_subchannel_, subchannel_->pollset_set(), - absl::make_unique(WeakRef(), report_interval_), + std::make_unique(WeakRef(), report_interval_), GRPC_TRACE_FLAG_ENABLED(grpc_orca_client_trace) ? "OrcaClient" : nullptr); } @@ -410,7 +409,7 @@ void OrcaWatcher::SetSubchannel(Subchannel* subchannel) { std::unique_ptr MakeOobBackendMetricWatcher(Duration report_interval, std::unique_ptr watcher) { - return absl::make_unique(report_interval, std::move(watcher)); + return std::make_unique(report_interval, std::move(watcher)); } } // namespace grpc_core diff --git a/src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.h b/src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.h index 2c37630db3c..3f5c7c9fe5d 100644 --- a/src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.h +++ b/src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.h @@ -38,7 +38,7 @@ namespace grpc_core { // subchannel like this: // subchannel->AddDataWatcher( // MakeOobBackendMetricWatcher( -// absl::make_unique(...))); +// std::make_unique(...))); class OobBackendMetricWatcher { public: diff --git a/src/core/ext/filters/client_channel/lb_policy/outlier_detection/outlier_detection.cc b/src/core/ext/filters/client_channel/lb_policy/outlier_detection/outlier_detection.cc index c9a5a85d60c..9c888b8735c 100644 --- a/src/core/ext/filters/client_channel/lb_policy/outlier_detection/outlier_detection.cc +++ b/src/core/ext/filters/client_channel/lb_policy/outlier_detection/outlier_detection.cc @@ -32,7 +32,6 @@ #include #include -#include "absl/memory/memory.h" #include "absl/random/random.h" #include "absl/status/status.h" #include "absl/status/statusor.h" @@ -307,8 +306,8 @@ class OutlierDetectionLb : public LoadBalancingPolicy { } private: - std::unique_ptr current_bucket_ = absl::make_unique(); - std::unique_ptr backup_bucket_ = absl::make_unique(); + std::unique_ptr current_bucket_ = std::make_unique(); + std::unique_ptr backup_bucket_ = std::make_unique(); // The bucket used to update call counts. // Points to either current_bucket or active_bucket. std::atomic active_bucket_{current_bucket_.get()}; @@ -434,7 +433,7 @@ void OutlierDetectionLb::SubchannelWrapper::WatchConnectivityState( std::unique_ptr watcher) { ConnectivityStateWatcherInterface* watcher_ptr = watcher.get(); auto watcher_wrapper = - absl::make_unique(std::move(watcher), ejected_); + std::make_unique(std::move(watcher), ejected_); watchers_.emplace(watcher_ptr, watcher_wrapper.get()); wrapped_subchannel()->WatchConnectivityState(std::move(watcher_wrapper)); } @@ -530,7 +529,7 @@ LoadBalancingPolicy::PickResult OutlierDetectionLb::Picker::Pick( // not both success_rate_ejection and failure_percentage_ejection are unset. if (counting_enabled_) { complete_pick->subchannel_call_tracker = - absl::make_unique( + std::make_unique( std::move(complete_pick->subchannel_call_tracker), subchannel_wrapper->subchannel_state()); } @@ -693,7 +692,7 @@ absl::Status OutlierDetectionLb::UpdateLocked(UpdateArgs args) { void OutlierDetectionLb::MaybeUpdatePickerLocked() { if (picker_ != nullptr) { auto outlier_detection_picker = - absl::make_unique(this, picker_, config_->CountingEnabled()); + std::make_unique(this, picker_, config_->CountingEnabled()); if (GRPC_TRACE_FLAG_ENABLED(grpc_outlier_detection_lb_trace)) { gpr_log(GPR_INFO, "[outlier_detection_lb %p] updating connectivity: state=%s " @@ -712,7 +711,7 @@ OrphanablePtr OutlierDetectionLb::CreateChildPolicyLocked( lb_policy_args.work_serializer = work_serializer(); lb_policy_args.args = args; lb_policy_args.channel_control_helper = - absl::make_unique(Ref(DEBUG_LOCATION, "Helper")); + std::make_unique(Ref(DEBUG_LOCATION, "Helper")); OrphanablePtr lb_policy = MakeOrphanable(std::move(lb_policy_args), &grpc_outlier_detection_lb_trace); @@ -1131,7 +1130,7 @@ void OutlierDetectionConfig::JsonPostLoad(const Json& json, const JsonArgs&, void RegisterOutlierDetectionLbPolicy(CoreConfiguration::Builder* builder) { if (XdsOutlierDetectionEnabled()) { builder->lb_policy_registry()->RegisterLoadBalancingPolicyFactory( - absl::make_unique()); + std::make_unique()); } } diff --git a/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc b/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc index 4de551743c4..eedb8e06ef8 100644 --- a/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc +++ b/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc @@ -25,7 +25,6 @@ #include #include -#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" @@ -241,14 +240,14 @@ void PickFirst::AttemptToConnectUsingLatestUpdateArgsLocked() { : latest_update_args_.addresses.status(); channel_control_helper()->UpdateState( GRPC_CHANNEL_TRANSIENT_FAILURE, status, - absl::make_unique(status)); + std::make_unique(status)); channel_control_helper()->RequestReresolution(); } // Otherwise, if this is the initial update, report CONNECTING. else if (subchannel_list_.get() == nullptr) { channel_control_helper()->UpdateState( GRPC_CHANNEL_CONNECTING, absl::Status(), - absl::make_unique(Ref(DEBUG_LOCATION, "QueuePicker"))); + std::make_unique(Ref(DEBUG_LOCATION, "QueuePicker"))); } // If the new update is empty or we don't yet have a selected subchannel in // the current list, replace the current subchannel list immediately. @@ -340,11 +339,11 @@ void PickFirst::PickFirstSubchannelData::ProcessConnectivityChangeLocked( .ToString())); p->channel_control_helper()->UpdateState( GRPC_CHANNEL_TRANSIENT_FAILURE, status, - absl::make_unique(status)); + std::make_unique(status)); } else { p->channel_control_helper()->UpdateState( GRPC_CHANNEL_CONNECTING, absl::Status(), - absl::make_unique( + std::make_unique( p->Ref(DEBUG_LOCATION, "QueuePicker"))); } return; @@ -362,7 +361,7 @@ void PickFirst::PickFirstSubchannelData::ProcessConnectivityChangeLocked( p->subchannel_list_.reset(); p->channel_control_helper()->UpdateState( GRPC_CHANNEL_IDLE, absl::Status(), - absl::make_unique(p->Ref(DEBUG_LOCATION, "QueuePicker"))); + std::make_unique(p->Ref(DEBUG_LOCATION, "QueuePicker"))); return; } // If we get here, there are two possible cases: @@ -436,7 +435,7 @@ void PickFirst::PickFirstSubchannelData::ProcessConnectivityChangeLocked( connectivity_status().ToString())); p->channel_control_helper()->UpdateState( GRPC_CHANNEL_TRANSIENT_FAILURE, status, - absl::make_unique(status)); + std::make_unique(status)); } } // If the next subchannel is in IDLE, trigger a connection attempt. @@ -462,7 +461,7 @@ void PickFirst::PickFirstSubchannelData::ProcessConnectivityChangeLocked( !subchannel_list()->in_transient_failure()) { p->channel_control_helper()->UpdateState( GRPC_CHANNEL_CONNECTING, absl::Status(), - absl::make_unique( + std::make_unique( p->Ref(DEBUG_LOCATION, "QueuePicker"))); } break; @@ -503,7 +502,7 @@ void PickFirst::PickFirstSubchannelData::ProcessUnselectedReadyLocked() { p->selected_ = this; p->channel_control_helper()->UpdateState( GRPC_CHANNEL_READY, absl::Status(), - absl::make_unique(subchannel()->Ref())); + std::make_unique(subchannel()->Ref())); for (size_t i = 0; i < subchannel_list()->num_subchannels(); ++i) { if (i != Index()) { subchannel_list()->subchannel(i)->ShutdownLocked(); @@ -539,7 +538,7 @@ class PickFirstFactory : public LoadBalancingPolicyFactory { void RegisterPickFirstLbPolicy(CoreConfiguration::Builder* builder) { builder->lb_policy_registry()->RegisterLoadBalancingPolicyFactory( - absl::make_unique()); + std::make_unique()); } } // namespace grpc_core diff --git a/src/core/ext/filters/client_channel/lb_policy/priority/priority.cc b/src/core/ext/filters/client_channel/lb_policy/priority/priority.cc index fbe080ef288..8913ac88c5e 100644 --- a/src/core/ext/filters/client_channel/lb_policy/priority/priority.cc +++ b/src/core/ext/filters/client_channel/lb_policy/priority/priority.cc @@ -26,7 +26,6 @@ #include #include -#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" @@ -421,7 +420,7 @@ void PriorityLb::ChoosePriorityLocked() { absl::UnavailableError("priority policy has empty priority list"); channel_control_helper()->UpdateState( GRPC_CHANNEL_TRANSIENT_FAILURE, status, - absl::make_unique(status)); + std::make_unique(status)); return; } // Iterate through priorities, searching for one in READY or IDLE, @@ -687,10 +686,10 @@ void PriorityLb::ChildPriority::Orphan() { std::unique_ptr PriorityLb::ChildPriority::GetPicker() { if (picker_wrapper_ == nullptr) { - return absl::make_unique( + return std::make_unique( priority_policy_->Ref(DEBUG_LOCATION, "QueuePicker")); } - return absl::make_unique(picker_wrapper_); + return std::make_unique(picker_wrapper_); } absl::Status PriorityLb::ChildPriority::UpdateLocked( @@ -731,7 +730,7 @@ PriorityLb::ChildPriority::CreateChildPolicyLocked(const ChannelArgs& args) { lb_policy_args.work_serializer = priority_policy_->work_serializer(); lb_policy_args.args = args; lb_policy_args.channel_control_helper = - absl::make_unique(this->Ref(DEBUG_LOCATION, "Helper")); + std::make_unique(this->Ref(DEBUG_LOCATION, "Helper")); OrphanablePtr lb_policy = MakeOrphanable(std::move(lb_policy_args), &grpc_lb_priority_trace); @@ -944,7 +943,7 @@ class PriorityLbFactory : public LoadBalancingPolicyFactory { void RegisterPriorityLbPolicy(CoreConfiguration::Builder* builder) { builder->lb_policy_registry()->RegisterLoadBalancingPolicyFactory( - absl::make_unique()); + std::make_unique()); } } // namespace grpc_core diff --git a/src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.cc b/src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.cc index 240b8fdbbab..e822e201f9d 100644 --- a/src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.cc +++ b/src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.cc @@ -32,7 +32,6 @@ #include "absl/base/attributes.h" #include "absl/base/thread_annotations.h" #include "absl/container/inlined_vector.h" -#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/numbers.h" @@ -661,7 +660,7 @@ void RingHash::RingHashSubchannelList::UpdateRingHashConnectivityStateLocked( // Note that we use our own picker regardless of connectivity state. p->channel_control_helper()->UpdateState( state, status, - absl::make_unique(Ref(DEBUG_LOCATION, "RingHashPicker"))); + std::make_unique(Ref(DEBUG_LOCATION, "RingHashPicker"))); // While the ring_hash policy is reporting TRANSIENT_FAILURE, it will // not be getting any pick requests from the priority policy. // However, because the ring_hash policy does not attempt to @@ -848,7 +847,7 @@ absl::Status RingHash::UpdateLocked(UpdateArgs args) { : args.addresses.status(); channel_control_helper()->UpdateState( GRPC_CHANNEL_TRANSIENT_FAILURE, status, - absl::make_unique(status)); + std::make_unique(status)); return status; } // Otherwise, report IDLE. @@ -885,7 +884,7 @@ class RingHashFactory : public LoadBalancingPolicyFactory { void RegisterRingHashLbPolicy(CoreConfiguration::Builder* builder) { builder->lb_policy_registry()->RegisterLoadBalancingPolicyFactory( - absl::make_unique()); + std::make_unique()); } } // namespace grpc_core diff --git a/src/core/ext/filters/client_channel/lb_policy/rls/rls.cc b/src/core/ext/filters/client_channel/lb_policy/rls/rls.cc index 8a0770a91ba..3144db0f42e 100644 --- a/src/core/ext/filters/client_channel/lb_policy/rls/rls.cc +++ b/src/core/ext/filters/client_channel/lb_policy/rls/rls.cc @@ -40,7 +40,6 @@ #include "absl/base/thread_annotations.h" #include "absl/hash/hash.h" -#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" @@ -728,7 +727,7 @@ RlsLb::ChildPolicyWrapper::ChildPolicyWrapper(RefCountedPtr lb_policy, : nullptr), lb_policy_(lb_policy), target_(std::move(target)), - picker_(absl::make_unique(std::move(lb_policy))) { + picker_(std::make_unique(std::move(lb_policy))) { lb_policy_->child_policy_map_.emplace(target_, this); } @@ -809,7 +808,7 @@ void RlsLb::ChildPolicyWrapper::StartUpdate() { config.status().ToString().c_str()); } pending_config_.reset(); - picker_ = absl::make_unique( + picker_ = std::make_unique( absl::UnavailableError(config.status().message())); child_policy_.reset(); } else { @@ -825,7 +824,7 @@ absl::Status RlsLb::ChildPolicyWrapper::MaybeFinishUpdate() { if (child_policy_ == nullptr) { Args create_args; create_args.work_serializer = lb_policy_->work_serializer(); - create_args.channel_control_helper = absl::make_unique( + create_args.channel_control_helper = std::make_unique( WeakRef(DEBUG_LOCATION, "ChildPolicyHelper")); create_args.args = lb_policy_->channel_args_; child_policy_ = MakeOrphanable(std::move(create_args), @@ -1156,7 +1155,7 @@ void RlsLb::Cache::Entry::BackoffTimer::OnBackoffTimer( // std::unique_ptr MakeCacheEntryBackoff() { - return absl::make_unique( + return std::make_unique( BackOff::Options() .set_initial_backoff(kCacheBackoffInitial) .set_multiplier(kCacheBackoffMultiplier) @@ -2140,7 +2139,7 @@ void RlsLb::UpdatePickerLocked() { status = absl::UnavailableError("no children available"); } channel_control_helper()->UpdateState( - state, status, absl::make_unique(Ref(DEBUG_LOCATION, "Picker"))); + state, status, std::make_unique(Ref(DEBUG_LOCATION, "Picker"))); } // @@ -2504,7 +2503,7 @@ class RlsLbFactory : public LoadBalancingPolicyFactory { void RegisterRlsLbPolicy(CoreConfiguration::Builder* builder) { builder->lb_policy_registry()->RegisterLoadBalancingPolicyFactory( - absl::make_unique()); + std::make_unique()); } } // namespace grpc_core diff --git a/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc b/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc index 87e028ba176..9294fdfcd1b 100644 --- a/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc +++ b/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc @@ -25,7 +25,6 @@ #include #include -#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" @@ -307,7 +306,7 @@ absl::Status RoundRobin::UpdateLocked(UpdateArgs args) { : args.addresses.status(); channel_control_helper()->UpdateState( GRPC_CHANNEL_TRANSIENT_FAILURE, status, - absl::make_unique(status)); + std::make_unique(status)); return status; } // Otherwise, if this is the initial update, immediately promote it to @@ -316,7 +315,7 @@ absl::Status RoundRobin::UpdateLocked(UpdateArgs args) { subchannel_list_ = std::move(latest_pending_subchannel_list_); channel_control_helper()->UpdateState( GRPC_CHANNEL_CONNECTING, absl::Status(), - absl::make_unique(Ref(DEBUG_LOCATION, "QueuePicker"))); + std::make_unique(Ref(DEBUG_LOCATION, "QueuePicker"))); } return absl::OkStatus(); } @@ -387,8 +386,8 @@ void RoundRobin::RoundRobinSubchannelList:: gpr_log(GPR_INFO, "[RR %p] reporting READY with subchannel list %p", p, this); } - p->channel_control_helper()->UpdateState( - GRPC_CHANNEL_READY, absl::Status(), absl::make_unique(p, this)); + p->channel_control_helper()->UpdateState(GRPC_CHANNEL_READY, absl::Status(), + std::make_unique(p, this)); } else if (num_connecting_ > 0) { if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_round_robin_trace)) { gpr_log(GPR_INFO, "[RR %p] reporting CONNECTING with subchannel list %p", @@ -396,7 +395,7 @@ void RoundRobin::RoundRobinSubchannelList:: } p->channel_control_helper()->UpdateState( GRPC_CHANNEL_CONNECTING, absl::Status(), - absl::make_unique(p->Ref(DEBUG_LOCATION, "QueuePicker"))); + std::make_unique(p->Ref(DEBUG_LOCATION, "QueuePicker"))); } else if (num_transient_failure_ == num_subchannels()) { if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_round_robin_trace)) { gpr_log(GPR_INFO, @@ -410,7 +409,7 @@ void RoundRobin::RoundRobinSubchannelList:: } p->channel_control_helper()->UpdateState( GRPC_CHANNEL_TRANSIENT_FAILURE, last_failure_, - absl::make_unique(last_failure_)); + std::make_unique(last_failure_)); } } @@ -525,7 +524,7 @@ class RoundRobinFactory : public LoadBalancingPolicyFactory { void RegisterRoundRobinLbPolicy(CoreConfiguration::Builder* builder) { builder->lb_policy_registry()->RegisterLoadBalancingPolicyFactory( - absl::make_unique()); + std::make_unique()); } } // namespace grpc_core diff --git a/src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc b/src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc index 39546cd02e8..d3787eb73f0 100644 --- a/src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc +++ b/src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc @@ -26,7 +26,6 @@ #include #include -#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" @@ -363,7 +362,7 @@ absl::Status WeightedTargetLb::UpdateLocked(UpdateArgs args) { "no children in weighted_target policy: ", args.resolution_note)); channel_control_helper()->UpdateState( GRPC_CHANNEL_TRANSIENT_FAILURE, status, - absl::make_unique(status)); + std::make_unique(status)); return absl::OkStatus(); } UpdateStateLocked(); @@ -459,15 +458,15 @@ void WeightedTargetLb::UpdateStateLocked() { absl::Status status; switch (connectivity_state) { case GRPC_CHANNEL_READY: - picker = absl::make_unique(std::move(ready_picker_list)); + picker = std::make_unique(std::move(ready_picker_list)); break; case GRPC_CHANNEL_CONNECTING: case GRPC_CHANNEL_IDLE: picker = - absl::make_unique(Ref(DEBUG_LOCATION, "QueuePicker")); + std::make_unique(Ref(DEBUG_LOCATION, "QueuePicker")); break; default: - picker = absl::make_unique(std::move(tf_picker_list)); + picker = std::make_unique(std::move(tf_picker_list)); } channel_control_helper()->UpdateState(connectivity_state, status, std::move(picker)); @@ -561,7 +560,7 @@ WeightedTargetLb::WeightedChild::CreateChildPolicyLocked( lb_policy_args.work_serializer = weighted_target_policy_->work_serializer(); lb_policy_args.args = args; lb_policy_args.channel_control_helper = - absl::make_unique(this->Ref(DEBUG_LOCATION, "Helper")); + std::make_unique(this->Ref(DEBUG_LOCATION, "Helper")); OrphanablePtr lb_policy = MakeOrphanable(std::move(lb_policy_args), &grpc_lb_weighted_target_trace); @@ -770,7 +769,7 @@ class WeightedTargetLbFactory : public LoadBalancingPolicyFactory { void RegisterWeightedTargetLbPolicy(CoreConfiguration::Builder* builder) { builder->lb_policy_registry()->RegisterLoadBalancingPolicyFactory( - absl::make_unique()); + std::make_unique()); } } // namespace grpc_core diff --git a/src/core/ext/filters/client_channel/lb_policy/xds/cds.cc b/src/core/ext/filters/client_channel/lb_policy/xds/cds.cc index 7b4ba262d4b..d86f66cb830 100644 --- a/src/core/ext/filters/client_channel/lb_policy/xds/cds.cc +++ b/src/core/ext/filters/client_channel/lb_policy/xds/cds.cc @@ -24,7 +24,6 @@ #include #include -#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" @@ -546,7 +545,7 @@ void CdsLb::OnClusterChanged(const std::string& name, LoadBalancingPolicy::Args args; args.work_serializer = work_serializer(); args.args = args_; - args.channel_control_helper = absl::make_unique(Ref()); + args.channel_control_helper = std::make_unique(Ref()); child_policy_ = CoreConfiguration::Get() .lb_policy_registry() @@ -600,7 +599,7 @@ void CdsLb::OnError(const std::string& name, absl::Status status) { if (child_policy_ == nullptr) { channel_control_helper()->UpdateState( GRPC_CHANNEL_TRANSIENT_FAILURE, status, - absl::make_unique(absl::UnavailableError( + std::make_unique(absl::UnavailableError( absl::StrCat(name, ": ", status.ToString())))); } } @@ -614,7 +613,7 @@ void CdsLb::OnResourceDoesNotExist(const std::string& name) { absl::StrCat("CDS resource \"", config_->cluster(), "\" does not exist")); channel_control_helper()->UpdateState( GRPC_CHANNEL_TRANSIENT_FAILURE, status, - absl::make_unique(status)); + std::make_unique(status)); MaybeDestroyChildPolicyLocked(); } @@ -766,7 +765,7 @@ class CdsLbFactory : public LoadBalancingPolicyFactory { void RegisterCdsLbPolicy(CoreConfiguration::Builder* builder) { builder->lb_policy_registry()->RegisterLoadBalancingPolicyFactory( - absl::make_unique()); + std::make_unique()); } } // namespace grpc_core diff --git a/src/core/ext/filters/client_channel/lb_policy/xds/xds.h b/src/core/ext/filters/client_channel/lb_policy/xds/xds.h index d0a8a73015e..0b2ea4e2f9a 100644 --- a/src/core/ext/filters/client_channel/lb_policy/xds/xds.h +++ b/src/core/ext/filters/client_channel/lb_policy/xds/xds.h @@ -23,8 +23,6 @@ #include #include -#include "absl/memory/memory.h" - #include "src/core/ext/xds/xds_client_stats.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/resolver/server_address.h" @@ -44,7 +42,7 @@ class XdsLocalityAttribute : public ServerAddress::AttributeInterface { } std::unique_ptr Copy() const override { - return absl::make_unique(locality_name_->Ref()); + return std::make_unique(locality_name_->Ref()); } int Cmp(const AttributeInterface* other) const override { diff --git a/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_impl.cc b/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_impl.cc index 3b371be4fe7..e1d8f28c4de 100644 --- a/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_impl.cc +++ b/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_impl.cc @@ -27,7 +27,6 @@ #include #include "absl/base/thread_annotations.h" -#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" @@ -418,7 +417,7 @@ LoadBalancingPolicy::PickResult XdsClusterImplLb::Picker::Pick( } // Inject subchannel call tracker to record call completion. complete_pick->subchannel_call_tracker = - absl::make_unique( + std::make_unique( std::move(complete_pick->subchannel_call_tracker), std::move(locality_stats), call_counter_->Ref(DEBUG_LOCATION, "SubchannelCallTracker")); @@ -531,7 +530,7 @@ void XdsClusterImplLb::MaybeUpdatePickerLocked() { // If we're dropping all calls, report READY, regardless of what (or // whether) the child has reported. if (config_->drop_config() != nullptr && config_->drop_config()->drop_all()) { - auto drop_picker = absl::make_unique(this, picker_); + auto drop_picker = std::make_unique(this, picker_); if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_cluster_impl_lb_trace)) { gpr_log(GPR_INFO, "[xds_cluster_impl_lb %p] updating connectivity (drop all): " @@ -544,7 +543,7 @@ void XdsClusterImplLb::MaybeUpdatePickerLocked() { } // Otherwise, update only if we have a child picker. if (picker_ != nullptr) { - auto drop_picker = absl::make_unique(this, picker_); + auto drop_picker = std::make_unique(this, picker_); if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_cluster_impl_lb_trace)) { gpr_log(GPR_INFO, "[xds_cluster_impl_lb %p] updating connectivity: state=%s " @@ -563,7 +562,7 @@ OrphanablePtr XdsClusterImplLb::CreateChildPolicyLocked( lb_policy_args.work_serializer = work_serializer(); lb_policy_args.args = args; lb_policy_args.channel_control_helper = - absl::make_unique(Ref(DEBUG_LOCATION, "Helper")); + std::make_unique(Ref(DEBUG_LOCATION, "Helper")); OrphanablePtr lb_policy = MakeOrphanable(std::move(lb_policy_args), &grpc_xds_cluster_impl_lb_trace); @@ -794,7 +793,7 @@ class XdsClusterImplLbFactory : public LoadBalancingPolicyFactory { void RegisterXdsClusterImplLbPolicy(CoreConfiguration::Builder* builder) { builder->lb_policy_registry()->RegisterLoadBalancingPolicyFactory( - absl::make_unique()); + std::make_unique()); } } // namespace grpc_core diff --git a/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_manager.cc b/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_manager.cc index 12c74b758a9..f9dbbcec1b7 100644 --- a/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_manager.cc +++ b/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_manager.cc @@ -25,7 +25,6 @@ #include #include -#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" @@ -408,11 +407,11 @@ void XdsClusterManagerLb::UpdateStateLocked() { } child_picker = MakeRefCounted( cluster_name, - absl::make_unique(Ref(DEBUG_LOCATION, "QueuePicker"))); + std::make_unique(Ref(DEBUG_LOCATION, "QueuePicker"))); } } std::unique_ptr picker = - absl::make_unique(std::move(cluster_map)); + std::make_unique(std::move(cluster_map)); absl::Status status; if (connectivity_state == GRPC_CHANNEL_TRANSIENT_FAILURE) { status = absl::Status(absl::StatusCode::kUnavailable, @@ -480,7 +479,7 @@ XdsClusterManagerLb::ClusterChild::CreateChildPolicyLocked( xds_cluster_manager_policy_->work_serializer(); lb_policy_args.args = args; lb_policy_args.channel_control_helper = - absl::make_unique(this->Ref(DEBUG_LOCATION, "Helper")); + std::make_unique(this->Ref(DEBUG_LOCATION, "Helper")); OrphanablePtr lb_policy = MakeOrphanable(std::move(lb_policy_args), &grpc_xds_cluster_manager_lb_trace); @@ -712,7 +711,7 @@ class XdsClusterManagerLbFactory : public LoadBalancingPolicyFactory { void RegisterXdsClusterManagerLbPolicy(CoreConfiguration::Builder* builder) { builder->lb_policy_registry()->RegisterLoadBalancingPolicyFactory( - absl::make_unique()); + std::make_unique()); } } // namespace grpc_core diff --git a/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_resolver.cc b/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_resolver.cc index df087ed49f9..83009bd4792 100644 --- a/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_resolver.cc +++ b/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_resolver.cc @@ -27,7 +27,6 @@ #include #include -#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" @@ -515,7 +514,7 @@ void XdsClusterResolverLb::LogicalDNSDiscoveryMechanism::Start() { resolver_ = CoreConfiguration::Get().resolver_registry().CreateResolver( target.c_str(), args, parent()->interested_parties(), parent()->work_serializer(), - absl::make_unique( + std::make_unique( Ref(DEBUG_LOCATION, "LogicalDNSDiscoveryMechanism"))); if (resolver_ == nullptr) { parent()->OnResourceDoesNotExist( @@ -840,12 +839,12 @@ ServerAddressList XdsClusterResolverLb::CreateChildPolicyAddressesLocked() { kHierarchicalPathAttributeKey, MakeHierarchicalPathAttribute(hierarchical_path)) .WithAttribute(kXdsLocalityNameAttributeKey, - absl::make_unique( + std::make_unique( locality_name->Ref())) .WithAttribute( ServerAddressWeightAttribute:: kServerAddressWeightAttributeKey, - absl::make_unique(weight))); + std::make_unique(weight))); } } } @@ -1015,7 +1014,7 @@ XdsClusterResolverLb::CreateChildPolicyConfigLocked() { "config"); channel_control_helper()->UpdateState( GRPC_CHANNEL_TRANSIENT_FAILURE, status, - absl::make_unique(status)); + std::make_unique(status)); return nullptr; } return std::move(*config); @@ -1052,7 +1051,7 @@ XdsClusterResolverLb::CreateChildPolicyLocked(const ChannelArgs& args) { lb_policy_args.work_serializer = work_serializer(); lb_policy_args.args = args; lb_policy_args.channel_control_helper = - absl::make_unique(Ref(DEBUG_LOCATION, "Helper")); + std::make_unique(Ref(DEBUG_LOCATION, "Helper")); OrphanablePtr lb_policy = CoreConfiguration::Get().lb_policy_registry().CreateLoadBalancingPolicy( "priority_experimental", std::move(lb_policy_args)); @@ -1294,7 +1293,7 @@ class XdsClusterResolverLbFactory : public LoadBalancingPolicyFactory { void RegisterXdsClusterResolverLbPolicy(CoreConfiguration::Builder* builder) { builder->lb_policy_registry()->RegisterLoadBalancingPolicyFactory( - absl::make_unique()); + std::make_unique()); } } // namespace grpc_core diff --git a/src/core/ext/filters/client_channel/resolver/binder/binder_resolver.cc b/src/core/ext/filters/client_channel/resolver/binder/binder_resolver.cc index 3fa1a485a6e..0640958c292 100644 --- a/src/core/ext/filters/client_channel/resolver/binder/binder_resolver.cc +++ b/src/core/ext/filters/client_channel/resolver/binder/binder_resolver.cc @@ -30,7 +30,6 @@ #include #include -#include "absl/memory/memory.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" @@ -142,7 +141,7 @@ class BinderResolverFactory : public ResolverFactory { void RegisterBinderResolver(CoreConfiguration::Builder* builder) { builder->resolver_registry()->RegisterResolverFactory( - absl::make_unique()); + std::make_unique()); } } // namespace grpc_core diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc index 458d92fd57b..8453b085695 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc @@ -28,7 +28,6 @@ #include #include "absl/base/thread_annotations.h" -#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/string_view.h" @@ -832,7 +831,7 @@ bool UseAresDnsResolver() { void RegisterAresDnsResolver(CoreConfiguration::Builder* builder) { if (UseAresDnsResolver()) { builder->resolver_registry()->RegisterResolverFactory( - absl::make_unique()); + std::make_unique()); } } @@ -846,8 +845,7 @@ void grpc_resolver_dns_ares_init() { GRPC_LOG_IF_ERROR("grpc_ares_init() failed", error); return; } - grpc_core::ResetDNSResolver( - absl::make_unique()); + grpc_core::ResetDNSResolver(std::make_unique()); } } diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc index ae5cec860da..371a61f8f2d 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc @@ -21,7 +21,6 @@ #include #include "absl/base/thread_annotations.h" -#include "absl/memory/memory.h" #include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/closure.h" @@ -108,7 +107,7 @@ class GrpcPolledFdFactoryPosix : public GrpcPolledFdFactory { }; std::unique_ptr NewGrpcPolledFdFactory(Mutex* /* mu */) { - return absl::make_unique(); + return std::make_unique(); } } // namespace grpc_core diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc index 24c305c16ba..88aaa4fc736 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc @@ -874,7 +874,7 @@ class GrpcPolledFdFactoryWindows : public GrpcPolledFdFactory { }; std::unique_ptr NewGrpcPolledFdFactory(Mutex* mu) { - return absl::make_unique(mu); + return std::make_unique(mu); } } // namespace grpc_core diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc index f89a7a7fc33..cf6be4737ed 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc @@ -43,7 +43,6 @@ #include #include -#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" @@ -658,7 +657,7 @@ static void on_hostbyname_done_locked(void* arg, int status, int /*timeouts*/, std::unique_ptr* address_list_ptr = hr->is_balancer ? r->balancer_addresses_out : r->addresses_out; if (*address_list_ptr == nullptr) { - *address_list_ptr = absl::make_unique(); + *address_list_ptr = std::make_unique(); } ServerAddressList& addresses = **address_list_ptr; for (size_t i = 0; hostent->h_addr_list[i] != nullptr; ++i) { @@ -920,7 +919,7 @@ static bool inner_resolve_as_ip_literal_locked( grpc_parse_ipv6_hostport(hostport->c_str(), &addr, false /* log errors */)) { GPR_ASSERT(*addrs == nullptr); - *addrs = absl::make_unique(); + *addrs = std::make_unique(); (*addrs)->emplace_back(addr.addr, addr.len, grpc_core::ChannelArgs()); return true; } @@ -978,7 +977,7 @@ static bool inner_maybe_resolve_localhost_manually_locked( } if (gpr_stricmp(host->c_str(), "localhost") == 0) { GPR_ASSERT(*addrs == nullptr); - *addrs = absl::make_unique(); + *addrs = std::make_unique(); uint16_t numeric_port = grpc_strhtons(port->c_str()); // Append the ipv6 loopback address. struct sockaddr_in6 ipv6_loopback_addr; diff --git a/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc b/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc index 5ec094dc666..c865b4fc8f4 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc @@ -23,7 +23,6 @@ #include #include "absl/functional/bind_front.h" -#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" @@ -190,12 +189,12 @@ void RegisterNativeDnsResolver(CoreConfiguration::Builder* builder) { if (gpr_stricmp(resolver, "native") == 0) { gpr_log(GPR_DEBUG, "Using native dns resolver"); builder->resolver_registry()->RegisterResolverFactory( - absl::make_unique()); + std::make_unique()); } else { if (!builder->resolver_registry()->HasResolverFactory("dns")) { gpr_log(GPR_DEBUG, "Using native dns resolver"); builder->resolver_registry()->RegisterResolverFactory( - absl::make_unique()); + std::make_unique()); } } } diff --git a/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc b/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc index 2a3144e77bf..506e95a2730 100644 --- a/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc +++ b/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc @@ -24,7 +24,6 @@ #include #include -#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/string_view.h" @@ -362,7 +361,7 @@ class FakeResolverFactory : public ResolverFactory { void RegisterFakeResolver(CoreConfiguration::Builder* builder) { builder->resolver_registry()->RegisterResolverFactory( - absl::make_unique()); + std::make_unique()); } } // namespace grpc_core diff --git a/src/core/ext/filters/client_channel/resolver/google_c2p/google_c2p_resolver.cc b/src/core/ext/filters/client_channel/resolver/google_c2p/google_c2p_resolver.cc index 012464dcd0d..6a3ea7db137 100644 --- a/src/core/ext/filters/client_channel/resolver/google_c2p/google_c2p_resolver.cc +++ b/src/core/ext/filters/client_channel/resolver/google_c2p/google_c2p_resolver.cc @@ -25,7 +25,6 @@ #include #include -#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" @@ -453,9 +452,9 @@ class ExperimentalGoogleCloud2ProdResolverFactory : public ResolverFactory { void RegisterCloud2ProdResolver(CoreConfiguration::Builder* builder) { builder->resolver_registry()->RegisterResolverFactory( - absl::make_unique()); + std::make_unique()); builder->resolver_registry()->RegisterResolverFactory( - absl::make_unique()); + std::make_unique()); } } // namespace grpc_core diff --git a/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc b/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc index 42c9535dea3..bd02d837736 100644 --- a/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc +++ b/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc @@ -22,7 +22,6 @@ #include #include -#include "absl/memory/memory.h" #include "absl/status/statusor.h" #include "absl/strings/str_split.h" #include "absl/strings/string_view.h" @@ -179,14 +178,14 @@ class UnixAbstractResolverFactory : public ResolverFactory { void RegisterSockaddrResolver(CoreConfiguration::Builder* builder) { builder->resolver_registry()->RegisterResolverFactory( - absl::make_unique()); + std::make_unique()); builder->resolver_registry()->RegisterResolverFactory( - absl::make_unique()); + std::make_unique()); #ifdef GRPC_HAVE_UNIX_SOCKET builder->resolver_registry()->RegisterResolverFactory( - absl::make_unique()); + std::make_unique()); builder->resolver_registry()->RegisterResolverFactory( - absl::make_unique()); + std::make_unique()); #endif } diff --git a/src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc b/src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc index dd8a003ce6e..564fa6f3c0c 100644 --- a/src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc +++ b/src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc @@ -27,7 +27,6 @@ #include #include -#include "absl/memory/memory.h" #include "absl/meta/type_traits.h" #include "absl/random/random.h" #include "absl/status/status.h" @@ -1124,7 +1123,7 @@ class XdsResolverFactory : public ResolverFactory { void RegisterXdsResolver(CoreConfiguration::Builder* builder) { builder->resolver_registry()->RegisterResolverFactory( - absl::make_unique()); + std::make_unique()); } } // namespace grpc_core diff --git a/src/core/ext/filters/client_channel/resolver_result_parsing.cc b/src/core/ext/filters/client_channel/resolver_result_parsing.cc index d92cd0d4642..88204294531 100644 --- a/src/core/ext/filters/client_channel/resolver_result_parsing.cc +++ b/src/core/ext/filters/client_channel/resolver_result_parsing.cc @@ -24,7 +24,6 @@ #include #include -#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" @@ -50,7 +49,7 @@ size_t ClientChannelServiceConfigParser::ParserIndex() { void ClientChannelServiceConfigParser::Register( CoreConfiguration::Builder* builder) { builder->service_config_parser()->RegisterParser( - absl::make_unique()); + std::make_unique()); } namespace { @@ -143,7 +142,7 @@ ClientChannelServiceConfigParser::ParseGlobalParams(const ChannelArgs& /*args*/, grpc_error_std_string(error))); return status; } - return absl::make_unique( + return std::make_unique( std::move(parsed_lb_config), std::move(lb_policy_name), std::move(health_check_service_name)); } @@ -178,8 +177,8 @@ ClientChannelServiceConfigParser::ParsePerMethodParams( grpc_error_std_string(error))); return status; } - return absl::make_unique(timeout, - wait_for_ready); + return std::make_unique(timeout, + wait_for_ready); } } // namespace internal diff --git a/src/core/ext/filters/client_channel/retry_service_config.cc b/src/core/ext/filters/client_channel/retry_service_config.cc index cd2a646e603..8d9367061dd 100644 --- a/src/core/ext/filters/client_channel/retry_service_config.cc +++ b/src/core/ext/filters/client_channel/retry_service_config.cc @@ -27,7 +27,6 @@ #include #include -#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/strings/str_cat.h" #include "absl/types/optional.h" @@ -56,7 +55,7 @@ size_t RetryServiceConfigParser::ParserIndex() { void RetryServiceConfigParser::Register(CoreConfiguration::Builder* builder) { builder->service_config_parser()->RegisterParser( - absl::make_unique()); + std::make_unique()); } namespace { @@ -156,8 +155,8 @@ RetryServiceConfigParser::ParseGlobalParams(const ChannelArgs& /*args*/, grpc_error_std_string(error))); return status; } - return absl::make_unique(max_milli_tokens, - milli_token_ratio); + return std::make_unique(max_milli_tokens, + milli_token_ratio); } namespace { @@ -313,7 +312,7 @@ RetryServiceConfigParser::ParsePerMethodParams(const ChannelArgs& args, grpc_error_std_string(error))); return status; } - return absl::make_unique( + return std::make_unique( max_attempts, initial_backoff, max_backoff, backoff_multiplier, retryable_status_codes, per_attempt_recv_timeout); } diff --git a/src/core/ext/filters/fault_injection/service_config_parser.cc b/src/core/ext/filters/fault_injection/service_config_parser.cc index f5ebdb36cf0..e60639bbbec 100644 --- a/src/core/ext/filters/fault_injection/service_config_parser.cc +++ b/src/core/ext/filters/fault_injection/service_config_parser.cc @@ -21,7 +21,6 @@ #include #include -#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/strings/str_cat.h" #include "absl/types/optional.h" @@ -168,14 +167,14 @@ FaultInjectionServiceConfigParser::ParsePerMethodParams(const ChannelArgs& args, return status; } if (fault_injection_policies.empty()) return nullptr; - return absl::make_unique( + return std::make_unique( std::move(fault_injection_policies)); } void FaultInjectionServiceConfigParser::Register( CoreConfiguration::Builder* builder) { builder->service_config_parser()->RegisterParser( - absl::make_unique()); + std::make_unique()); } size_t FaultInjectionServiceConfigParser::ParserIndex() { diff --git a/src/core/ext/filters/message_size/message_size_filter.cc b/src/core/ext/filters/message_size/message_size_filter.cc index a6e4e62cbc5..cf4817e86c6 100644 --- a/src/core/ext/filters/message_size/message_size_filter.cc +++ b/src/core/ext/filters/message_size/message_size_filter.cc @@ -25,7 +25,6 @@ #include #include -#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" @@ -121,13 +120,13 @@ MessageSizeParser::ParsePerMethodParams(const ChannelArgs& /*args*/, grpc_error_std_string(error))); return status; } - return absl::make_unique(max_request_message_bytes, - max_response_message_bytes); + return std::make_unique(max_request_message_bytes, + max_response_message_bytes); } void MessageSizeParser::Register(CoreConfiguration::Builder* builder) { builder->service_config_parser()->RegisterParser( - absl::make_unique()); + std::make_unique()); } size_t MessageSizeParser::ParserIndex() { diff --git a/src/core/ext/filters/rbac/rbac_service_config_parser.cc b/src/core/ext/filters/rbac/rbac_service_config_parser.cc index c451eefcf37..30b5be23876 100644 --- a/src/core/ext/filters/rbac/rbac_service_config_parser.cc +++ b/src/core/ext/filters/rbac/rbac_service_config_parser.cc @@ -23,7 +23,6 @@ #include #include -#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" @@ -193,7 +192,7 @@ Rbac::Permission ParsePermission(const Json::Object& permission_json, continue; } std::vector permission_error_list; - permissions.emplace_back(absl::make_unique( + permissions.emplace_back(std::make_unique( ParsePermission(*permission_json, &permission_error_list))); if (!permission_error_list.empty()) { error_list->push_back(GRPC_ERROR_CREATE_FROM_VECTOR_AND_CPP_STRING( @@ -329,7 +328,7 @@ Rbac::Principal ParsePrincipal(const Json::Object& principal_json, continue; } std::vector principal_error_list; - principals.emplace_back(absl::make_unique( + principals.emplace_back(std::make_unique( ParsePrincipal(*principal_json, &principal_error_list))); if (!principal_error_list.empty()) { error_list->push_back(GRPC_ERROR_CREATE_FROM_VECTOR_AND_CPP_STRING( @@ -489,7 +488,7 @@ Rbac::Policy ParsePolicy(const Json::Object& policy_json, continue; } std::vector permission_error_list; - permissions.emplace_back(absl::make_unique( + permissions.emplace_back(std::make_unique( ParsePermission(*permission_json, &permission_error_list))); if (!permission_error_list.empty()) { error_list->push_back(GRPC_ERROR_CREATE_FROM_VECTOR_AND_CPP_STRING( @@ -509,7 +508,7 @@ Rbac::Policy ParsePolicy(const Json::Object& policy_json, continue; } std::vector principal_error_list; - principals.emplace_back(absl::make_unique( + principals.emplace_back(std::make_unique( ParsePrincipal(*principal_json, &principal_error_list))); if (!principal_error_list.empty()) { error_list->push_back(GRPC_ERROR_CREATE_FROM_VECTOR_AND_CPP_STRING( @@ -604,12 +603,12 @@ RbacServiceConfigParser::ParsePerMethodParams(const ChannelArgs& args, return status; } if (rbac_policies.empty()) return nullptr; - return absl::make_unique(std::move(rbac_policies)); + return std::make_unique(std::move(rbac_policies)); } void RbacServiceConfigParser::Register(CoreConfiguration::Builder* builder) { builder->service_config_parser()->RegisterParser( - absl::make_unique()); + std::make_unique()); } size_t RbacServiceConfigParser::ParserIndex() { diff --git a/src/core/ext/filters/server_config_selector/server_config_selector_filter.cc b/src/core/ext/filters/server_config_selector/server_config_selector_filter.cc index 2669cff2ed5..f919147721a 100644 --- a/src/core/ext/filters/server_config_selector/server_config_selector_filter.cc +++ b/src/core/ext/filters/server_config_selector/server_config_selector_filter.cc @@ -21,7 +21,6 @@ #include #include "absl/base/thread_annotations.h" -#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/types/optional.h" @@ -113,7 +112,7 @@ ServerConfigSelectorFilter::ServerConfigSelectorFilter( state_(std::make_shared()) { GPR_ASSERT(server_config_selector_provider_ != nullptr); auto server_config_selector_watcher = - absl::make_unique(state_); + std::make_unique(state_); auto config_selector = server_config_selector_provider_->Watch( std::move(server_config_selector_watcher)); MutexLock lock(&state_->mu); diff --git a/src/core/ext/transport/binder/client/endpoint_binder_pool.cc b/src/core/ext/transport/binder/client/endpoint_binder_pool.cc index 14263536540..6ed85621339 100644 --- a/src/core/ext/transport/binder/client/endpoint_binder_pool.cc +++ b/src/core/ext/transport/binder/client/endpoint_binder_pool.cc @@ -39,7 +39,7 @@ Java_io_grpc_binder_cpp_GrpcBinderConnection_notifyConnected__Ljava_lang_String_ grpc_binder::ndk_util::SpAIBinder aibinder = grpc_binder::FromJavaBinder(jni_env, ibinder); gpr_log(GPR_INFO, "%s got aibinder = %p", __func__, aibinder.get()); - auto b = absl::make_unique(aibinder); + auto b = std::make_unique(aibinder); GPR_ASSERT(b != nullptr); grpc_binder::GetEndpointBinderPool()->AddEndpointBinder(conn_id, std::move(b)); diff --git a/src/core/ext/transport/binder/server/binder_server_credentials.cc b/src/core/ext/transport/binder/server/binder_server_credentials.cc index d43f928ed76..877bd35ff6f 100644 --- a/src/core/ext/transport/binder/server/binder_server_credentials.cc +++ b/src/core/ext/transport/binder/server/binder_server_credentials.cc @@ -38,7 +38,7 @@ class BinderServerCredentialsImpl final : public ServerCredentials { return grpc_core::AddBinderPort( std::string(addr), server, [](grpc_binder::TransactionReceiver::OnTransactCb transact_cb) { - return absl::make_unique( + return std::make_unique( nullptr, std::move(transact_cb)); }, security_policy_); diff --git a/src/core/ext/transport/binder/transport/binder_transport.cc b/src/core/ext/transport/binder/transport/binder_transport.cc index 9da0855b1d5..5a10bbf8658 100644 --- a/src/core/ext/transport/binder/transport/binder_transport.cc +++ b/src/core/ext/transport/binder/transport/binder_transport.cc @@ -386,7 +386,7 @@ static void perform_stream_op_locked(void* stream_op, if (!gbs->is_client) { // Send trailing metadata to inform the other end about the cancellation, // regardless if we'd already done that or not. - auto cancel_tx = absl::make_unique( + auto cancel_tx = std::make_unique( gbs->GetTxCode(), gbt->is_client); cancel_tx->SetSuffix(grpc_binder::Metadata{}); cancel_tx->SetStatus(1); @@ -432,8 +432,7 @@ static void perform_stream_op_locked(void* stream_op, } int tx_code = gbs->tx_code; - auto tx = - absl::make_unique(tx_code, gbt->is_client); + auto tx = std::make_unique(tx_code, gbt->is_client); if (op->send_initial_metadata) { gpr_log(GPR_INFO, "send_initial_metadata"); diff --git a/src/core/ext/transport/binder/wire_format/binder_android.cc b/src/core/ext/transport/binder/wire_format/binder_android.cc index bba8616d6a8..c26e84130d0 100644 --- a/src/core/ext/transport/binder/wire_format/binder_android.cc +++ b/src/core/ext/transport/binder/wire_format/binder_android.cc @@ -70,7 +70,7 @@ ndk_util::binder_status_t f_onTransact(ndk_util::AIBinder* binder, TransactionReceiver::OnTransactCb* callback = user_data->callback; // Wrap the parcel in a ReadableParcel. std::unique_ptr output = - absl::make_unique(in); + std::make_unique(in); // The lock should be released "after" the callback finishes. absl::Status status = (*callback)(code, output.get(), ndk_util::AIBinder_getCallingUid()); @@ -217,8 +217,8 @@ absl::Status BinderAndroid::Transact(BinderTransportTxCode tx_code) { std::unique_ptr BinderAndroid::ConstructTxReceiver( grpc_core::RefCountedPtr wire_reader_ref, TransactionReceiver::OnTransactCb transact_cb) const { - return absl::make_unique(wire_reader_ref, - transact_cb); + return std::make_unique(wire_reader_ref, + transact_cb); } int32_t WritableParcelAndroid::GetDataSize() const { @@ -282,7 +282,7 @@ absl::Status ReadableParcelAndroid::ReadBinder(std::unique_ptr* data) { *data = nullptr; return absl::InternalError("AParcel_readStrongBinder failed"); } - *data = absl::make_unique(ndk_util::SpAIBinder(binder)); + *data = std::make_unique(ndk_util::SpAIBinder(binder)); return absl::OkStatus(); } diff --git a/src/core/ext/transport/binder/wire_format/binder_android.h b/src/core/ext/transport/binder/wire_format/binder_android.h index 774bc09bb0f..eec77218bba 100644 --- a/src/core/ext/transport/binder/wire_format/binder_android.h +++ b/src/core/ext/transport/binder/wire_format/binder_android.h @@ -80,7 +80,7 @@ class BinderAndroid final : public Binder { public: explicit BinderAndroid(ndk_util::SpAIBinder binder) : binder_(binder), - input_parcel_(absl::make_unique()) {} + input_parcel_(std::make_unique()) {} ~BinderAndroid() override = default; void* GetRawBinder() override { return binder_.get(); } diff --git a/src/core/ext/transport/chttp2/server/chttp2_server.cc b/src/core/ext/transport/chttp2/server/chttp2_server.cc index 6fae3c647cc..e6aaae0af33 100644 --- a/src/core/ext/transport/chttp2/server/chttp2_server.cc +++ b/src/core/ext/transport/chttp2/server/chttp2_server.cc @@ -31,7 +31,6 @@ #include #include "absl/base/thread_annotations.h" -#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" @@ -766,7 +765,7 @@ Chttp2ServerListener::~Chttp2ServerListener() { void Chttp2ServerListener::Start( Server* /*server*/, const std::vector* /* pollsets */) { if (server_->config_fetcher() != nullptr) { - auto watcher = absl::make_unique(Ref()); + auto watcher = std::make_unique(Ref()); config_fetcher_watcher_ = watcher.get(); server_->config_fetcher()->StartWatch( grpc_sockaddr_to_string(&resolved_address_, false).value(), diff --git a/src/core/ext/xds/file_watcher_certificate_provider_factory.cc b/src/core/ext/xds/file_watcher_certificate_provider_factory.cc index ce7092f32de..06cd65d3657 100644 --- a/src/core/ext/xds/file_watcher_certificate_provider_factory.cc +++ b/src/core/ext/xds/file_watcher_certificate_provider_factory.cc @@ -24,7 +24,6 @@ #include #include -#include "absl/memory/memory.h" #include "absl/strings/str_format.h" #include "absl/strings/str_join.h" @@ -147,7 +146,7 @@ FileWatcherCertificateProviderFactory::CreateCertificateProvider( void RegisterFileWatcherCertificateProvider( CoreConfiguration::Builder* builder) { builder->certificate_provider_registry()->RegisterCertificateProviderFactory( - absl::make_unique()); + std::make_unique()); } } // namespace grpc_core diff --git a/src/core/ext/xds/xds_bootstrap_grpc.cc b/src/core/ext/xds/xds_bootstrap_grpc.cc index 177fcade9b4..36031210570 100644 --- a/src/core/ext/xds/xds_bootstrap_grpc.cc +++ b/src/core/ext/xds/xds_bootstrap_grpc.cc @@ -25,7 +25,6 @@ #include #include -#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/match.h" @@ -235,7 +234,7 @@ absl::StatusOr> GrpcXdsBootstrap::Create( }; auto bootstrap = LoadFromJson(*json, XdsJsonArgs()); if (!bootstrap.ok()) return bootstrap.status(); - return absl::make_unique(std::move(*bootstrap)); + return std::make_unique(std::move(*bootstrap)); } const JsonLoaderInterface* GrpcXdsBootstrap::JsonLoader(const JsonArgs&) { diff --git a/src/core/ext/xds/xds_certificate_provider.cc b/src/core/ext/xds/xds_certificate_provider.cc index e64879d3e76..8eec42be21e 100644 --- a/src/core/ext/xds/xds_certificate_provider.cc +++ b/src/core/ext/xds/xds_certificate_provider.cc @@ -23,7 +23,6 @@ #include #include "absl/functional/bind_front.h" -#include "absl/memory/memory.h" #include "absl/types/optional.h" #include @@ -189,7 +188,7 @@ void XdsCertificateProvider::ClusterCertificateState:: void XdsCertificateProvider::ClusterCertificateState::UpdateRootCertWatcher( const std::string& cert_name, grpc_tls_certificate_distributor* root_cert_distributor) { - auto watcher = absl::make_unique( + auto watcher = std::make_unique( xds_certificate_provider_->distributor_, cert_name); root_cert_watcher_ = watcher.get(); root_cert_distributor->WatchTlsCertificates(std::move(watcher), @@ -199,7 +198,7 @@ void XdsCertificateProvider::ClusterCertificateState::UpdateRootCertWatcher( void XdsCertificateProvider::ClusterCertificateState::UpdateIdentityCertWatcher( const std::string& cert_name, grpc_tls_certificate_distributor* identity_cert_distributor) { - auto watcher = absl::make_unique( + auto watcher = std::make_unique( xds_certificate_provider_->distributor_, cert_name); identity_cert_watcher_ = watcher.get(); identity_cert_distributor->WatchTlsCertificates( @@ -288,10 +287,10 @@ void XdsCertificateProvider::UpdateRootCertNameAndDistributor( MutexLock lock(&mu_); auto it = certificate_state_map_.find(cert_name); if (it == certificate_state_map_.end()) { - it = certificate_state_map_ - .emplace(cert_name, - absl::make_unique(this)) - .first; + it = + certificate_state_map_ + .emplace(cert_name, std::make_unique(this)) + .first; } it->second->UpdateRootCertNameAndDistributor(cert_name, root_cert_name, root_cert_distributor); @@ -313,10 +312,10 @@ void XdsCertificateProvider::UpdateIdentityCertNameAndDistributor( MutexLock lock(&mu_); auto it = certificate_state_map_.find(cert_name); if (it == certificate_state_map_.end()) { - it = certificate_state_map_ - .emplace(cert_name, - absl::make_unique(this)) - .first; + it = + certificate_state_map_ + .emplace(cert_name, std::make_unique(this)) + .first; } it->second->UpdateIdentityCertNameAndDistributor( cert_name, identity_cert_name, identity_cert_distributor); @@ -364,10 +363,10 @@ void XdsCertificateProvider::WatchStatusCallback(std::string cert_name, MutexLock lock(&mu_); auto it = certificate_state_map_.find(cert_name); if (it == certificate_state_map_.end()) { - it = certificate_state_map_ - .emplace(cert_name, - absl::make_unique(this)) - .first; + it = + certificate_state_map_ + .emplace(cert_name, std::make_unique(this)) + .first; } it->second->WatchStatusCallback(cert_name, root_being_watched, identity_being_watched); diff --git a/src/core/ext/xds/xds_client.cc b/src/core/ext/xds/xds_client.cc index 84364642026..57383c4b83f 100644 --- a/src/core/ext/xds/xds_client.cc +++ b/src/core/ext/xds/xds_client.cc @@ -23,7 +23,6 @@ #include -#include "absl/memory/memory.h" #include "absl/strings/match.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" @@ -880,7 +879,7 @@ XdsClient::ChannelState::AdsCallState::AdsCallState( : "/envoy.service.discovery.v2.AggregatedDiscoveryService/" "StreamAggregatedResources"; call_ = chand()->transport_->CreateStreamingCall( - method, absl::make_unique( + method, std::make_unique( // Passing the initial ref here. This ref will go away when // the StreamEventHandler is destroyed. RefCountedPtr(this))); @@ -1269,7 +1268,7 @@ XdsClient::ChannelState::LrsCallState::LrsCallState( : "/envoy.service.load_stats.v2." "LoadReportingService/StreamLoadStats"; call_ = chand()->transport_->CreateStreamingCall( - method, absl::make_unique( + method, std::make_unique( // Passing the initial ref here. This ref will go away when // the StreamEventHandler is destroyed. RefCountedPtr(this))); diff --git a/src/core/ext/xds/xds_cluster.cc b/src/core/ext/xds/xds_cluster.cc index 6d35791d0b5..6b1e8580620 100644 --- a/src/core/ext/xds/xds_cluster.cc +++ b/src/core/ext/xds/xds_cluster.cc @@ -22,7 +22,6 @@ #include -#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" @@ -541,7 +540,7 @@ XdsResourceType::DecodeResult XdsClusterResourceType::Decode( gpr_log(GPR_INFO, "[xds_client %p] parsed Cluster %s: %s", context.client, result.name->c_str(), cds_resource->ToString().c_str()); } - auto resource = absl::make_unique(); + auto resource = std::make_unique(); resource->resource = std::move(*cds_resource); result.resource = std::move(resource); } diff --git a/src/core/ext/xds/xds_cluster_specifier_plugin.cc b/src/core/ext/xds/xds_cluster_specifier_plugin.cc index fbe3fba9fb0..3fbf773adff 100644 --- a/src/core/ext/xds/xds_cluster_specifier_plugin.cc +++ b/src/core/ext/xds/xds_cluster_specifier_plugin.cc @@ -24,7 +24,6 @@ #include #include -#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/strings/str_cat.h" #include "upb/json_encode.h" @@ -140,7 +139,7 @@ void XdsClusterSpecifierPluginRegistry::RegisterPlugin( void XdsClusterSpecifierPluginRegistry::Init() { g_plugin_registry = new PluginRegistryMap; - RegisterPlugin(absl::make_unique(), + RegisterPlugin(std::make_unique(), kXdsRouteLookupClusterSpecifierPluginConfigName); } diff --git a/src/core/ext/xds/xds_endpoint.cc b/src/core/ext/xds/xds_endpoint.cc index 53f4946f440..092f32f4a08 100644 --- a/src/core/ext/xds/xds_endpoint.cc +++ b/src/core/ext/xds/xds_endpoint.cc @@ -23,7 +23,6 @@ #include #include -#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" @@ -212,7 +211,7 @@ absl::optional ServerAddressParse( std::map> attributes; attributes[ServerAddressWeightAttribute::kServerAddressWeightAttributeKey] = - absl::make_unique(weight); + std::make_unique(weight); return ServerAddress(grpc_address, ChannelArgs(), std::move(attributes)); } @@ -424,7 +423,7 @@ XdsResourceType::DecodeResult XdsEndpointResourceType::Decode( context.client, result.name->c_str(), eds_resource->ToString().c_str()); } - auto resource = absl::make_unique(); + auto resource = std::make_unique(); resource->resource = std::move(*eds_resource); result.resource = std::move(resource); } diff --git a/src/core/ext/xds/xds_http_filters.cc b/src/core/ext/xds/xds_http_filters.cc index 46da4dca6ac..3528a827c64 100644 --- a/src/core/ext/xds/xds_http_filters.cc +++ b/src/core/ext/xds/xds_http_filters.cc @@ -23,7 +23,6 @@ #include #include -#include "absl/memory/memory.h" #include "absl/status/status.h" #include "envoy/extensions/filters/http/router/v3/router.upb.h" #include "envoy/extensions/filters/http/router/v3/router.upbdefs.h" @@ -111,13 +110,13 @@ void XdsHttpFilterRegistry::PopulateSymtab(upb_DefPool* symtab) { void XdsHttpFilterRegistry::Init() { g_filters = new FilterOwnerList; g_filter_registry = new FilterRegistryMap; - RegisterFilter(absl::make_unique(), + RegisterFilter(std::make_unique(), {kXdsHttpRouterFilterConfigName}); - RegisterFilter(absl::make_unique(), + RegisterFilter(std::make_unique(), {kXdsHttpFaultFilterConfigName}); - RegisterFilter(absl::make_unique(), + RegisterFilter(std::make_unique(), {kXdsHttpRbacFilterConfigName}); - RegisterFilter(absl::make_unique(), + RegisterFilter(std::make_unique(), {kXdsHttpRbacFilterConfigOverrideName}); } diff --git a/src/core/ext/xds/xds_lb_policy_registry.cc b/src/core/ext/xds/xds_lb_policy_registry.cc index a18d743d9d2..ac91fa63ea8 100644 --- a/src/core/ext/xds/xds_lb_policy_registry.cc +++ b/src/core/ext/xds/xds_lb_policy_registry.cc @@ -24,7 +24,6 @@ #include #include -#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" @@ -272,13 +271,13 @@ absl::StatusOr XdsLbPolicyRegistry::ConvertXdsLbPolicyConfig( XdsLbPolicyRegistry::XdsLbPolicyRegistry() { policy_config_factories_.emplace( RingHashLbPolicyConfigFactory::Type(), - absl::make_unique()); + std::make_unique()); policy_config_factories_.emplace( RoundRobinLbPolicyConfigFactory::Type(), - absl::make_unique()); + std::make_unique()); policy_config_factories_.emplace( WrrLocalityLbPolicyConfigFactory::Type(), - absl::make_unique()); + std::make_unique()); } XdsLbPolicyRegistry* XdsLbPolicyRegistry::Get() { diff --git a/src/core/ext/xds/xds_listener.cc b/src/core/ext/xds/xds_listener.cc index c227692fa05..2754afdab7d 100644 --- a/src/core/ext/xds/xds_listener.cc +++ b/src/core/ext/xds/xds_listener.cc @@ -23,7 +23,6 @@ #include #include -#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" @@ -1092,7 +1091,7 @@ XdsResourceType::DecodeResult XdsListenerResourceType::Decode( context.client, result.name->c_str(), listener->ToString().c_str()); } - auto resource = absl::make_unique(); + auto resource = std::make_unique(); resource->resource = std::move(*listener); result.resource = std::move(resource); } diff --git a/src/core/ext/xds/xds_route_config.cc b/src/core/ext/xds/xds_route_config.cc index 23f9b9170d4..edd41393b16 100644 --- a/src/core/ext/xds/xds_route_config.cc +++ b/src/core/ext/xds/xds_route_config.cc @@ -28,7 +28,6 @@ #include #include -#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" @@ -143,7 +142,7 @@ XdsRouteConfigResource::Route::RouteAction::HashPolicy::HashPolicy( regex_substitution(other.regex_substitution) { if (other.regex != nullptr) { regex = - absl::make_unique(other.regex->pattern(), other.regex->options()); + std::make_unique(other.regex->pattern(), other.regex->options()); } } @@ -154,7 +153,7 @@ XdsRouteConfigResource::Route::RouteAction::HashPolicy::operator=( header_name = other.header_name; if (other.regex != nullptr) { regex = - absl::make_unique(other.regex->pattern(), other.regex->options()); + std::make_unique(other.regex->pattern(), other.regex->options()); } regex_substitution = other.regex_substitution; return *this; @@ -887,7 +886,7 @@ absl::StatusOr RouteActionParse( continue; } RE2::Options options; - policy.regex = absl::make_unique( + policy.regex = std::make_unique( UpbStringToStdString( envoy_type_matcher_v3_RegexMatcher_regex(regex_matcher)), options); @@ -1141,7 +1140,7 @@ XdsResourceType::DecodeResult XdsRouteConfigResourceType::Decode( context.client, result.name->c_str(), rds_update->ToString().c_str()); } - auto resource = absl::make_unique(); + auto resource = std::make_unique(); resource->resource = std::move(*rds_update); result.resource = std::move(resource); } diff --git a/src/core/lib/channel/promise_based_filter.cc b/src/core/lib/channel/promise_based_filter.cc index 70dc6cccb6d..5c99adc05e4 100644 --- a/src/core/lib/channel/promise_based_filter.cc +++ b/src/core/lib/channel/promise_based_filter.cc @@ -20,7 +20,6 @@ #include #include "absl/base/attributes.h" -#include "absl/memory/memory.h" #include "absl/types/variant.h" #include @@ -445,7 +444,7 @@ class ClientCallData::PollContext { }; // Unique ptr --> release to suppress clang-tidy warnings about allocating // in a destructor. - auto* p = absl::make_unique().release(); + auto* p = std::make_unique().release(); p->call_stack = self_->call_stack(); p->call_data = self_; GRPC_CALL_STACK_REF(self_->call_stack(), "re-poll"); @@ -912,7 +911,7 @@ class ServerCallData::PollContext { GRPC_CALL_STACK_UNREF(next_poll->call_stack, "re-poll"); delete next_poll; }; - auto* p = absl::make_unique().release(); + auto* p = std::make_unique().release(); p->call_stack = self_->call_stack(); p->call_data = self_; GRPC_CALL_STACK_REF(self_->call_stack(), "re-poll"); diff --git a/src/core/lib/event_engine/default_event_engine_factory.cc b/src/core/lib/event_engine/default_event_engine_factory.cc index 3a8ec198fd3..a4311bc9668 100644 --- a/src/core/lib/event_engine/default_event_engine_factory.cc +++ b/src/core/lib/event_engine/default_event_engine_factory.cc @@ -18,8 +18,6 @@ #include -#include "absl/memory/memory.h" - #include #ifdef GPR_WINDOWS @@ -29,7 +27,7 @@ namespace grpc_event_engine { namespace experimental { std::unique_ptr DefaultEventEngineFactory() { - return absl::make_unique(); + return std::make_unique(); } } // namespace experimental @@ -41,7 +39,7 @@ namespace grpc_event_engine { namespace experimental { std::unique_ptr DefaultEventEngineFactory() { - return absl::make_unique(); + return std::make_unique(); } } // namespace experimental diff --git a/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc b/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc index b9b15200f11..1fe97d0f06e 100644 --- a/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc +++ b/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc @@ -20,7 +20,6 @@ #include #include -#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/status/statusor.h" @@ -70,11 +69,10 @@ class Epoll1EventHandle : public EventHandle { : fd_(fd), list_(this), poller_(poller), - read_closure_(absl::make_unique(poller->GetScheduler())), - write_closure_( - absl::make_unique(poller->GetScheduler())), + read_closure_(std::make_unique(poller->GetScheduler())), + write_closure_(std::make_unique(poller->GetScheduler())), error_closure_( - absl::make_unique(poller->GetScheduler())) { + std::make_unique(poller->GetScheduler())) { read_closure_->InitEvent(); write_closure_->InitEvent(); error_closure_->InitEvent(); diff --git a/src/core/lib/event_engine/posix_engine/timer_manager.cc b/src/core/lib/event_engine/posix_engine/timer_manager.cc index a446f7f3a08..ceb834c7701 100644 --- a/src/core/lib/event_engine/posix_engine/timer_manager.cc +++ b/src/core/lib/event_engine/posix_engine/timer_manager.cc @@ -23,7 +23,6 @@ #include #include -#include "absl/memory/memory.h" #include "absl/time/time.h" #include "absl/types/optional.h" @@ -201,7 +200,7 @@ void TimerManager::Run() { bool TimerManager::IsTimerManagerThread() { return g_timer_thread; } TimerManager::TimerManager() : host_(this) { - timer_list_ = absl::make_unique(&host_); + timer_list_ = std::make_unique(&host_); grpc_core::MutexLock lock(&mu_); StartThread(); } diff --git a/src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.cc b/src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.cc index d6c7dab8c27..a430c74afd6 100644 --- a/src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.cc +++ b/src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.cc @@ -16,7 +16,6 @@ #include -#include "absl/memory/memory.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" @@ -92,7 +91,7 @@ absl::StatusOr> EventFdWakeupFd::CreateEventFdWakeupFd() { static bool kIsEventFdWakeupFdSupported = EventFdWakeupFd::IsSupported(); if (kIsEventFdWakeupFdSupported) { - auto event_fd_wakeup_fd = absl::make_unique(); + auto event_fd_wakeup_fd = std::make_unique(); auto status = event_fd_wakeup_fd->Init(); if (status.ok()) { return std::unique_ptr(std::move(event_fd_wakeup_fd)); diff --git a/src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.cc b/src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.cc index d2fe6ef8b14..e3d6bef3fa8 100644 --- a/src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.cc +++ b/src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.cc @@ -17,7 +17,6 @@ #include #include -#include "absl/memory/memory.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" @@ -120,7 +119,7 @@ bool PipeWakeupFd::IsSupported() { absl::StatusOr> PipeWakeupFd::CreatePipeWakeupFd() { static bool kIsPipeWakeupFdSupported = PipeWakeupFd::IsSupported(); if (kIsPipeWakeupFdSupported) { - auto pipe_wakeup_fd = absl::make_unique(); + auto pipe_wakeup_fd = std::make_unique(); auto status = pipe_wakeup_fd->Init(); if (status.ok()) { return std::unique_ptr(std::move(pipe_wakeup_fd)); diff --git a/src/core/lib/iomgr/iomgr_posix.cc b/src/core/lib/iomgr/iomgr_posix.cc index 82453649e52..b61eebe648c 100644 --- a/src/core/lib/iomgr/iomgr_posix.cc +++ b/src/core/lib/iomgr/iomgr_posix.cc @@ -38,8 +38,7 @@ extern grpc_pollset_vtable grpc_posix_pollset_vtable; extern grpc_pollset_set_vtable grpc_posix_pollset_set_vtable; static void iomgr_platform_init(void) { - grpc_core::ResetDNSResolver( - absl::make_unique()); + grpc_core::ResetDNSResolver(std::make_unique()); grpc_wakeup_fd_global_init(); grpc_event_engine_init(); grpc_tcp_posix_init(); diff --git a/src/core/lib/iomgr/iomgr_posix_cfstream.cc b/src/core/lib/iomgr/iomgr_posix_cfstream.cc index 518a268cc8a..26691b2a2c0 100644 --- a/src/core/lib/iomgr/iomgr_posix_cfstream.cc +++ b/src/core/lib/iomgr/iomgr_posix_cfstream.cc @@ -180,8 +180,7 @@ void grpc_set_default_iomgr_platform() { } grpc_tcp_client_global_init(); grpc_set_timer_impl(&grpc_generic_timer_vtable); - grpc_core::ResetDNSResolver( - absl::make_unique()); + grpc_core::ResetDNSResolver(std::make_unique()); } bool grpc_iomgr_run_in_background() { diff --git a/src/core/lib/iomgr/iomgr_windows.cc b/src/core/lib/iomgr/iomgr_windows.cc index d45f2de2812..fe17b67b41c 100644 --- a/src/core/lib/iomgr/iomgr_windows.cc +++ b/src/core/lib/iomgr/iomgr_windows.cc @@ -61,8 +61,7 @@ static void iomgr_platform_init(void) { grpc_iocp_init(); grpc_pollset_global_init(); grpc_wsa_socket_flags_init(); - grpc_core::ResetDNSResolver( - absl::make_unique()); + grpc_core::ResetDNSResolver(std::make_unique()); } static void iomgr_platform_flush(void) { grpc_iocp_flush(); } diff --git a/src/core/lib/matchers/matchers.cc b/src/core/lib/matchers/matchers.cc index de74e0e9182..fa00b49f2eb 100644 --- a/src/core/lib/matchers/matchers.cc +++ b/src/core/lib/matchers/matchers.cc @@ -18,7 +18,6 @@ #include -#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/strings/ascii.h" #include "absl/strings/match.h" @@ -35,7 +34,7 @@ absl::StatusOr StringMatcher::Create(Type type, absl::string_view matcher, bool case_sensitive) { if (type == Type::kSafeRegex) { - auto regex_matcher = absl::make_unique(std::string(matcher)); + auto regex_matcher = std::make_unique(std::string(matcher)); if (!regex_matcher->ok()) { return absl::InvalidArgumentError( "Invalid regex string specified in matcher."); @@ -56,7 +55,7 @@ StringMatcher::StringMatcher(std::unique_ptr regex_matcher) StringMatcher::StringMatcher(const StringMatcher& other) : type_(other.type_), case_sensitive_(other.case_sensitive_) { if (type_ == Type::kSafeRegex) { - regex_matcher_ = absl::make_unique(other.regex_matcher_->pattern()); + regex_matcher_ = std::make_unique(other.regex_matcher_->pattern()); } else { string_matcher_ = other.string_matcher_; } @@ -65,7 +64,7 @@ StringMatcher::StringMatcher(const StringMatcher& other) StringMatcher& StringMatcher::operator=(const StringMatcher& other) { type_ = other.type_; if (type_ == Type::kSafeRegex) { - regex_matcher_ = absl::make_unique(other.regex_matcher_->pattern()); + regex_matcher_ = std::make_unique(other.regex_matcher_->pattern()); } else { string_matcher_ = other.string_matcher_; } diff --git a/src/core/lib/resolver/server_address.h b/src/core/lib/resolver/server_address.h index 922774dc908..0df037ae475 100644 --- a/src/core/lib/resolver/server_address.h +++ b/src/core/lib/resolver/server_address.h @@ -29,8 +29,6 @@ #include #include -#include "absl/memory/memory.h" - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gpr/useful.h" #include "src/core/lib/iomgr/resolved_address.h" @@ -127,7 +125,7 @@ class ServerAddressWeightAttribute : public ServerAddress::AttributeInterface { uint32_t weight() const { return weight_; } std::unique_ptr Copy() const override { - return absl::make_unique(weight_); + return std::make_unique(weight_); } int Cmp(const AttributeInterface* other) const override { diff --git a/src/core/lib/security/authorization/cel_authorization_engine.cc b/src/core/lib/security/authorization/cel_authorization_engine.cc index 6a9b9763ed4..2a75f76903f 100644 --- a/src/core/lib/security/authorization/cel_authorization_engine.cc +++ b/src/core/lib/security/authorization/cel_authorization_engine.cc @@ -21,7 +21,6 @@ #include #include -#include "absl/memory/memory.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" #include "absl/types/span.h" @@ -63,7 +62,7 @@ CelAuthorizationEngine::CreateCelAuthorizationEngine( policy and one allow policy, in that order."); return nullptr; } else { - return absl::make_unique(rbac_policies); + return std::make_unique(rbac_policies); } } diff --git a/src/core/lib/security/authorization/grpc_authorization_engine.cc b/src/core/lib/security/authorization/grpc_authorization_engine.cc index c13c8ed701e..7db7b465433 100644 --- a/src/core/lib/security/authorization/grpc_authorization_engine.cc +++ b/src/core/lib/security/authorization/grpc_authorization_engine.cc @@ -20,8 +20,6 @@ #include #include -#include "absl/memory/memory.h" - namespace grpc_core { GrpcAuthorizationEngine::GrpcAuthorizationEngine(Rbac policy) @@ -29,7 +27,7 @@ GrpcAuthorizationEngine::GrpcAuthorizationEngine(Rbac policy) for (auto& sub_policy : policy.policies) { Policy policy; policy.name = sub_policy.first; - policy.matcher = absl::make_unique( + policy.matcher = std::make_unique( std::move(sub_policy.second)); policies_.push_back(std::move(policy)); } diff --git a/src/core/lib/security/authorization/grpc_authorization_policy_provider.cc b/src/core/lib/security/authorization/grpc_authorization_policy_provider.cc index 044c81a464b..cc396aa9943 100644 --- a/src/core/lib/security/authorization/grpc_authorization_policy_provider.cc +++ b/src/core/lib/security/authorization/grpc_authorization_policy_provider.cc @@ -20,8 +20,6 @@ #include -#include "absl/memory/memory.h" - #include #include #include @@ -123,7 +121,7 @@ FileWatcherAuthorizationPolicyProvider::FileWatcherAuthorizationPolicyProvider( } } }; - refresh_thread_ = absl::make_unique( + refresh_thread_ = std::make_unique( "FileWatcherAuthorizationPolicyProvider_refreshing_thread", thread_lambda, WeakRef().release()); refresh_thread_->Start(); diff --git a/src/core/lib/security/authorization/matchers.cc b/src/core/lib/security/authorization/matchers.cc index e9c2d783491..8bbcae37638 100644 --- a/src/core/lib/security/authorization/matchers.cc +++ b/src/core/lib/security/authorization/matchers.cc @@ -21,7 +21,6 @@ #include #include -#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/string_view.h" @@ -42,35 +41,35 @@ std::unique_ptr AuthorizationMatcher::Create( for (const auto& rule : permission.permissions) { matchers.push_back(AuthorizationMatcher::Create(std::move(*rule))); } - return absl::make_unique(std::move(matchers)); + return std::make_unique(std::move(matchers)); } case Rbac::Permission::RuleType::kOr: { std::vector> matchers; for (const auto& rule : permission.permissions) { matchers.push_back(AuthorizationMatcher::Create(std::move(*rule))); } - return absl::make_unique(std::move(matchers)); + return std::make_unique(std::move(matchers)); } case Rbac::Permission::RuleType::kNot: - return absl::make_unique( + return std::make_unique( AuthorizationMatcher::Create(std::move(*permission.permissions[0]))); case Rbac::Permission::RuleType::kAny: - return absl::make_unique(); + return std::make_unique(); case Rbac::Permission::RuleType::kHeader: - return absl::make_unique( + return std::make_unique( std::move(permission.header_matcher)); case Rbac::Permission::RuleType::kPath: - return absl::make_unique( + return std::make_unique( std::move(permission.string_matcher)); case Rbac::Permission::RuleType::kDestIp: - return absl::make_unique( + return std::make_unique( IpAuthorizationMatcher::Type::kDestIp, std::move(permission.ip)); case Rbac::Permission::RuleType::kDestPort: - return absl::make_unique(permission.port); + return std::make_unique(permission.port); case Rbac::Permission::RuleType::kMetadata: - return absl::make_unique(permission.invert); + return std::make_unique(permission.invert); case Rbac::Permission::RuleType::kReqServerName: - return absl::make_unique( + return std::make_unique( std::move(permission.string_matcher)); } return nullptr; @@ -84,41 +83,41 @@ std::unique_ptr AuthorizationMatcher::Create( for (const auto& id : principal.principals) { matchers.push_back(AuthorizationMatcher::Create(std::move(*id))); } - return absl::make_unique(std::move(matchers)); + return std::make_unique(std::move(matchers)); } case Rbac::Principal::RuleType::kOr: { std::vector> matchers; for (const auto& id : principal.principals) { matchers.push_back(AuthorizationMatcher::Create(std::move(*id))); } - return absl::make_unique(std::move(matchers)); + return std::make_unique(std::move(matchers)); } case Rbac::Principal::RuleType::kNot: - return absl::make_unique( + return std::make_unique( AuthorizationMatcher::Create(std::move(*principal.principals[0]))); case Rbac::Principal::RuleType::kAny: - return absl::make_unique(); + return std::make_unique(); case Rbac::Principal::RuleType::kPrincipalName: - return absl::make_unique( + return std::make_unique( std::move(principal.string_matcher)); case Rbac::Principal::RuleType::kSourceIp: - return absl::make_unique( + return std::make_unique( IpAuthorizationMatcher::Type::kSourceIp, std::move(principal.ip)); case Rbac::Principal::RuleType::kDirectRemoteIp: - return absl::make_unique( + return std::make_unique( IpAuthorizationMatcher::Type::kDirectRemoteIp, std::move(principal.ip)); case Rbac::Principal::RuleType::kRemoteIp: - return absl::make_unique( + return std::make_unique( IpAuthorizationMatcher::Type::kRemoteIp, std::move(principal.ip)); case Rbac::Principal::RuleType::kHeader: - return absl::make_unique( + return std::make_unique( std::move(principal.header_matcher)); case Rbac::Principal::RuleType::kPath: - return absl::make_unique( + return std::make_unique( std::move(principal.string_matcher.value())); case Rbac::Principal::RuleType::kMetadata: - return absl::make_unique(principal.invert); + return std::make_unique(principal.invert); } return nullptr; } diff --git a/src/core/lib/security/authorization/mock_cel/cel_expr_builder_factory.h b/src/core/lib/security/authorization/mock_cel/cel_expr_builder_factory.h index b43689b6bb4..226e1ef35d4 100644 --- a/src/core/lib/security/authorization/mock_cel/cel_expr_builder_factory.h +++ b/src/core/lib/security/authorization/mock_cel/cel_expr_builder_factory.h @@ -19,8 +19,6 @@ #include -#include "absl/memory/memory.h" - #include "src/core/lib/security/authorization/mock_cel/cel_expression.h" #include "src/core/lib/security/authorization/mock_cel/flat_expr_builder.h" @@ -36,7 +34,7 @@ struct InterpreterOptions { inline std::unique_ptr CreateCelExpressionBuilder( const InterpreterOptions& options) { - return absl::make_unique(); + return std::make_unique(); } } // namespace mock_cel diff --git a/src/core/lib/security/authorization/mock_cel/cel_value.h b/src/core/lib/security/authorization/mock_cel/cel_value.h index 34006de62b0..13ccf2590cf 100644 --- a/src/core/lib/security/authorization/mock_cel/cel_value.h +++ b/src/core/lib/security/authorization/mock_cel/cel_value.h @@ -38,7 +38,6 @@ #include #include -#include "absl/memory/memory.h" #include "absl/strings/string_view.h" #include "absl/types/span.h" @@ -93,7 +92,7 @@ class ContainerBackedMapImpl : public CelMap { static std::unique_ptr Create( absl::Span> /*key_values*/) { - return absl::make_unique(); + return std::make_unique(); } }; diff --git a/src/core/lib/security/authorization/mock_cel/flat_expr_builder.h b/src/core/lib/security/authorization/mock_cel/flat_expr_builder.h index 6a148ffec76..3359238033a 100644 --- a/src/core/lib/security/authorization/mock_cel/flat_expr_builder.h +++ b/src/core/lib/security/authorization/mock_cel/flat_expr_builder.h @@ -22,7 +22,6 @@ #include #include -#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "google/api/expr/v1alpha1/syntax.upb.h" @@ -46,8 +45,8 @@ class FlatExprBuilder : public CelExpressionBuilder { const google_api_expr_v1alpha1_Expr* expr, const google_api_expr_v1alpha1_SourceInfo* source_info) const override { ExecutionPath path; - return absl::make_unique(nullptr, path, 0, - std::set{}); + return std::make_unique(nullptr, path, 0, + std::set{}); } absl::StatusOr> CreateExpression( @@ -55,8 +54,8 @@ class FlatExprBuilder : public CelExpressionBuilder { const google_api_expr_v1alpha1_SourceInfo* source_info, std::vector* warnings) const override { ExecutionPath path; - return absl::make_unique(nullptr, path, 0, - std::set{}); + return std::make_unique(nullptr, path, 0, + std::set{}); } }; diff --git a/src/core/lib/security/authorization/rbac_policy.cc b/src/core/lib/security/authorization/rbac_policy.cc index a63bd7cafb0..9dde6cc12f2 100644 --- a/src/core/lib/security/authorization/rbac_policy.cc +++ b/src/core/lib/security/authorization/rbac_policy.cc @@ -19,7 +19,6 @@ #include #include -#include "absl/memory/memory.h" #include "absl/strings/str_format.h" #include "absl/strings/str_join.h" @@ -99,7 +98,7 @@ Rbac::Permission Rbac::Permission::MakeNotPermission(Permission permission) { Permission not_permission; not_permission.type = Permission::RuleType::kNot; not_permission.permissions.push_back( - absl::make_unique(std::move(permission))); + std::make_unique(std::move(permission))); return not_permission; } @@ -271,7 +270,7 @@ Rbac::Principal Rbac::Principal::MakeNotPrincipal(Principal principal) { Principal not_principal; not_principal.type = Principal::RuleType::kNot; not_principal.principals.push_back( - absl::make_unique(std::move(principal))); + std::make_unique(std::move(principal))); return not_principal; } diff --git a/src/core/lib/security/authorization/rbac_translator.cc b/src/core/lib/security/authorization/rbac_translator.cc index 6be855a3114..89866f78d6c 100644 --- a/src/core/lib/security/authorization/rbac_translator.cc +++ b/src/core/lib/security/authorization/rbac_translator.cc @@ -25,7 +25,6 @@ #include #include -#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/strings/match.h" #include "absl/strings/str_cat.h" @@ -103,7 +102,7 @@ absl::StatusOr ParsePrincipalsArray(const Json& json) { absl::StrCat("\"principals\" ", i, ": ", matcher_or.status().message())); } - principal_names.push_back(absl::make_unique( + principal_names.push_back(std::make_unique( Rbac::Principal::MakeAuthenticatedPrincipal( std::move(matcher_or.value())))); } @@ -120,7 +119,7 @@ absl::StatusOr ParsePeer(const Json& json) { auto principal_names_or = ParsePrincipalsArray(it->second); if (!principal_names_or.ok()) return principal_names_or.status(); if (!principal_names_or.value().principals.empty()) { - peer.push_back(absl::make_unique( + peer.push_back(std::make_unique( std::move(principal_names_or.value()))); } } @@ -148,7 +147,7 @@ absl::StatusOr ParseHeaderValues( matcher_or.status().code(), absl::StrCat("\"values\" ", i, ": ", matcher_or.status().message())); } - values.push_back(absl::make_unique( + values.push_back(std::make_unique( Rbac::Permission::MakeHeaderPermission(std::move(matcher_or.value())))); } return Rbac::Permission::MakeOrPermission(std::move(values)); @@ -194,7 +193,7 @@ absl::StatusOr ParseHeadersArray(const Json& json) { absl::StrCat("\"headers\" ", i, ": ", headers_or.status().message())); } headers.push_back( - absl::make_unique(std::move(headers_or.value()))); + std::make_unique(std::move(headers_or.value()))); } return Rbac::Permission::MakeAndPermission(std::move(headers)); } @@ -213,7 +212,7 @@ absl::StatusOr ParsePathsArray(const Json& json) { matcher_or.status().code(), absl::StrCat("\"paths\" ", i, ": ", matcher_or.status().message())); } - paths.push_back(absl::make_unique( + paths.push_back(std::make_unique( Rbac::Permission::MakePathPermission(std::move(matcher_or.value())))); } return Rbac::Permission::MakeOrPermission(std::move(paths)); @@ -230,7 +229,7 @@ absl::StatusOr ParseRequest(const Json& json) { if (!paths_or.ok()) return paths_or.status(); if (!paths_or.value().permissions.empty()) { request.push_back( - absl::make_unique(std::move(paths_or.value()))); + std::make_unique(std::move(paths_or.value()))); } } it = json.object_value().find("headers"); @@ -242,7 +241,7 @@ absl::StatusOr ParseRequest(const Json& json) { if (!headers_or.ok()) return headers_or.status(); if (!headers_or.value().permissions.empty()) { request.push_back( - absl::make_unique(std::move(headers_or.value()))); + std::make_unique(std::move(headers_or.value()))); } } if (request.empty()) { diff --git a/src/core/lib/security/credentials/channel_creds_registry_init.cc b/src/core/lib/security/credentials/channel_creds_registry_init.cc index 6db348ef197..57c576a1022 100644 --- a/src/core/lib/security/credentials/channel_creds_registry_init.cc +++ b/src/core/lib/security/credentials/channel_creds_registry_init.cc @@ -20,7 +20,6 @@ #include -#include "absl/memory/memory.h" #include "absl/strings/string_view.h" #include @@ -71,11 +70,11 @@ class FakeChannelCredsFactory : public ChannelCredsFactory<> { void RegisterChannelDefaultCreds(CoreConfiguration::Builder* builder) { builder->channel_creds_registry()->RegisterChannelCredsFactory( - absl::make_unique()); + std::make_unique()); builder->channel_creds_registry()->RegisterChannelCredsFactory( - absl::make_unique()); + std::make_unique()); builder->channel_creds_registry()->RegisterChannelCredsFactory( - absl::make_unique()); + std::make_unique()); } } // namespace grpc_core diff --git a/src/core/lib/security/credentials/external/aws_external_account_credentials.cc b/src/core/lib/security/credentials/external/aws_external_account_credentials.cc index 8e9b1e055b2..be454b69c5b 100644 --- a/src/core/lib/security/credentials/external/aws_external_account_credentials.cc +++ b/src/core/lib/security/credentials/external/aws_external_account_credentials.cc @@ -22,7 +22,6 @@ #include #include -#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" @@ -465,7 +464,7 @@ void AwsExternalAccountCredentials::BuildSubjectToken() { if (signer_ == nullptr) { cred_verification_url_ = absl::StrReplaceAll( regional_cred_verification_url_, {{"{region}", region_}}); - signer_ = absl::make_unique( + signer_ = std::make_unique( access_key_id_, secret_access_key_, token_, "POST", cred_verification_url_, region_, "", std::map(), &error); diff --git a/src/core/lib/security/security_connector/tls/tls_security_connector.cc b/src/core/lib/security/security_connector/tls/tls_security_connector.cc index 48db3eab992..d0f2aef0a56 100644 --- a/src/core/lib/security/security_connector/tls/tls_security_connector.cc +++ b/src/core/lib/security/security_connector/tls/tls_security_connector.cc @@ -28,7 +28,6 @@ #include #include "absl/functional/bind_front.h" -#include "absl/memory/memory.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" @@ -285,7 +284,7 @@ TlsChannelSecurityConnector::TlsChannelSecurityConnector( SplitHostPort(target_name, &host, &port); target_name_ = std::string(host); // Create a watcher. - auto watcher_ptr = absl::make_unique(this); + auto watcher_ptr = std::make_unique(this); certificate_watcher_ = watcher_ptr.get(); // Register the watcher with the distributor. grpc_tls_certificate_distributor* distributor = @@ -587,7 +586,7 @@ TlsServerSecurityConnector::TlsServerSecurityConnector( tsi::TlsSessionKeyLoggerCache::Get(tls_session_key_log_file_path); } // Create a watcher. - auto watcher_ptr = absl::make_unique(this); + auto watcher_ptr = std::make_unique(this); certificate_watcher_ = watcher_ptr.get(); // Register the watcher with the distributor. grpc_tls_certificate_distributor* distributor = diff --git a/src/core/lib/security/transport/security_handshaker.cc b/src/core/lib/security/transport/security_handshaker.cc index 5ad740f88b4..2f2f90093f9 100644 --- a/src/core/lib/security/transport/security_handshaker.cc +++ b/src/core/lib/security/transport/security_handshaker.cc @@ -29,7 +29,6 @@ #include #include "absl/base/attributes.h" -#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" @@ -656,10 +655,10 @@ RefCountedPtr SecurityHandshakerCreate( void SecurityRegisterHandshakerFactories(CoreConfiguration::Builder* builder) { builder->handshaker_registry()->RegisterHandshakerFactory( false /* at_start */, HANDSHAKER_CLIENT, - absl::make_unique()); + std::make_unique()); builder->handshaker_registry()->RegisterHandshakerFactory( false /* at_start */, HANDSHAKER_SERVER, - absl::make_unique()); + std::make_unique()); } } // namespace grpc_core diff --git a/src/core/lib/service_config/service_config_impl.cc b/src/core/lib/service_config/service_config_impl.cc index f0ef95e0e50..62de724587c 100644 --- a/src/core/lib/service_config/service_config_impl.cc +++ b/src/core/lib/service_config/service_config_impl.cc @@ -24,7 +24,6 @@ #include #include -#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" @@ -97,7 +96,7 @@ absl::Status ServiceConfigImpl::ParseJsonMethodConfig(const ChannelArgs& args, errors.emplace_back(parsed_configs_or.status().message()); } else { auto parsed_configs = - absl::make_unique( + std::make_unique( std::move(*parsed_configs_or)); parsed_method_config_vectors_storage_.push_back(std::move(parsed_configs)); vector_ptr = parsed_method_config_vectors_storage_.back().get(); diff --git a/src/core/lib/surface/lame_client.cc b/src/core/lib/surface/lame_client.cc index 6f0b72b38a8..d6af3254c22 100644 --- a/src/core/lib/surface/lame_client.cc +++ b/src/core/lib/surface/lame_client.cc @@ -23,7 +23,6 @@ #include #include -#include "absl/memory/memory.h" #include "absl/status/statusor.h" #include @@ -67,7 +66,7 @@ absl::StatusOr LameClientFilter::Create( } LameClientFilter::LameClientFilter(absl::Status error) - : error_(std::move(error)), state_(absl::make_unique()) {} + : error_(std::move(error)), state_(std::make_unique()) {} LameClientFilter::State::State() : state_tracker("lame_client", GRPC_CHANNEL_SHUTDOWN) {} diff --git a/src/core/lib/surface/server.cc b/src/core/lib/surface/server.cc index 366f380078c..a42a58fe522 100644 --- a/src/core/lib/surface/server.cc +++ b/src/core/lib/surface/server.cc @@ -30,7 +30,6 @@ #include #include -#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/types/optional.h" @@ -562,11 +561,11 @@ void Server::Start() { } } if (unregistered_request_matcher_ == nullptr) { - unregistered_request_matcher_ = absl::make_unique(this); + unregistered_request_matcher_ = std::make_unique(this); } for (std::unique_ptr& rm : registered_methods_) { if (rm->matcher == nullptr) { - rm->matcher = absl::make_unique(this); + rm->matcher = std::make_unique(this); } } { @@ -633,7 +632,7 @@ void Server::SetRegisteredMethodAllocator( grpc_completion_queue* cq, void* method_tag, std::function allocator) { RegisteredMethod* rm = static_cast(method_tag); - rm->matcher = absl::make_unique( + rm->matcher = std::make_unique( this, cq, rm, std::move(allocator)); } @@ -641,8 +640,8 @@ void Server::SetBatchMethodAllocator( grpc_completion_queue* cq, std::function allocator) { GPR_DEBUG_ASSERT(unregistered_request_matcher_ == nullptr); unregistered_request_matcher_ = - absl::make_unique(this, cq, - std::move(allocator)); + std::make_unique(this, cq, + std::move(allocator)); } void Server::RegisterCompletionQueue(grpc_completion_queue* cq) { @@ -683,7 +682,7 @@ Server::RegisteredMethod* Server::RegisterMethod( flags); return nullptr; } - registered_methods_.emplace_back(absl::make_unique( + registered_methods_.emplace_back(std::make_unique( method, host, payload_handling, flags)); return registered_methods_.back().get(); } @@ -1015,7 +1014,7 @@ void Server::ChannelData::InitTransport(RefCountedPtr server, uint32_t max_probes = 0; size_t slots = 2 * num_registered_methods; registered_methods_ = - absl::make_unique>(slots); + std::make_unique>(slots); for (std::unique_ptr& rm : server_->registered_methods_) { Slice host; Slice method = Slice::FromExternalString(rm->method); diff --git a/src/core/lib/surface/server.h b/src/core/lib/surface/server.h index cecdb169dce..c02410d2d2d 100644 --- a/src/core/lib/surface/server.h +++ b/src/core/lib/surface/server.h @@ -31,7 +31,6 @@ #include #include "absl/base/thread_annotations.h" -#include "absl/memory/memory.h" #include "absl/status/statusor.h" #include "absl/types/optional.h" @@ -426,7 +425,7 @@ class Server : public InternallyRefCounted, MaybeFinishShutdown(); return nullptr; } - requests_complete_ = absl::make_unique(); + requests_complete_ = std::make_unique(); return requests_complete_.get(); } diff --git a/src/core/lib/transport/http_connect_handshaker.cc b/src/core/lib/transport/http_connect_handshaker.cc index 28553612fb9..913eff83fb3 100644 --- a/src/core/lib/transport/http_connect_handshaker.cc +++ b/src/core/lib/transport/http_connect_handshaker.cc @@ -27,7 +27,6 @@ #include #include "absl/base/thread_annotations.h" -#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" @@ -394,7 +393,7 @@ class HttpConnectHandshakerFactory : public HandshakerFactory { void RegisterHttpConnectHandshaker(CoreConfiguration::Builder* builder) { builder->handshaker_registry()->RegisterHandshakerFactory( true /* at_start */, HANDSHAKER_CLIENT, - absl::make_unique()); + std::make_unique()); } } // namespace grpc_core diff --git a/src/core/lib/transport/tcp_connect_handshaker.cc b/src/core/lib/transport/tcp_connect_handshaker.cc index 9e8a2856506..ebaaff54ff8 100644 --- a/src/core/lib/transport/tcp_connect_handshaker.cc +++ b/src/core/lib/transport/tcp_connect_handshaker.cc @@ -23,7 +23,6 @@ #include #include "absl/base/thread_annotations.h" -#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/string_view.h" @@ -241,7 +240,7 @@ class TCPConnectHandshakerFactory : public HandshakerFactory { void RegisterTCPConnectHandshaker(CoreConfiguration::Builder* builder) { builder->handshaker_registry()->RegisterHandshakerFactory( true /* at_start */, HANDSHAKER_CLIENT, - absl::make_unique()); + std::make_unique()); } } // namespace grpc_core diff --git a/src/core/tsi/ssl/session_cache/ssl_session_boringssl.cc b/src/core/tsi/ssl/session_cache/ssl_session_boringssl.cc index b30dea03ec5..769971f4ead 100644 --- a/src/core/tsi/ssl/session_cache/ssl_session_boringssl.cc +++ b/src/core/tsi/ssl/session_cache/ssl_session_boringssl.cc @@ -51,7 +51,7 @@ class BoringSslCachedSession : public SslCachedSession { std::unique_ptr SslCachedSession::Create( SslSessionPtr session) { - return absl::make_unique(std::move(session)); + return std::make_unique(std::move(session)); } } // namespace tsi diff --git a/src/core/tsi/ssl/session_cache/ssl_session_openssl.cc b/src/core/tsi/ssl/session_cache/ssl_session_openssl.cc index 04a35469ad1..37b8ad25ad5 100644 --- a/src/core/tsi/ssl/session_cache/ssl_session_openssl.cc +++ b/src/core/tsi/ssl/session_cache/ssl_session_openssl.cc @@ -73,7 +73,7 @@ class OpenSslCachedSession : public SslCachedSession { std::unique_ptr SslCachedSession::Create( SslSessionPtr session) { - return absl::make_unique(std::move(session)); + return std::make_unique(std::move(session)); } } // namespace tsi diff --git a/src/cpp/common/alts_util.cc b/src/cpp/common/alts_util.cc index 41b2d12df77..dcb76661fea 100644 --- a/src/cpp/common/alts_util.cc +++ b/src/cpp/common/alts_util.cc @@ -21,7 +21,6 @@ #include #include -#include "absl/memory/memory.h" #include "upb/upb.hpp" #include @@ -63,7 +62,7 @@ std::unique_ptr GetAltsContextFromAuthContext( gpr_log(GPR_ERROR, "security_level is invalid."); return nullptr; } - return absl::make_unique(AltsContext(ctx)); + return std::make_unique(AltsContext(ctx)); } grpc::Status AltsClientAuthzCheck( diff --git a/src/cpp/server/health/default_health_check_service.cc b/src/cpp/server/health/default_health_check_service.cc index ce3222d2ac2..363a533f144 100644 --- a/src/cpp/server/health/default_health_check_service.cc +++ b/src/cpp/server/health/default_health_check_service.cc @@ -23,7 +23,6 @@ #include #include -#include "absl/memory/memory.h" #include "upb/upb.h" #include "upb/upb.hpp" @@ -111,7 +110,7 @@ void DefaultHealthCheckService::UnregisterWatch( DefaultHealthCheckService::HealthCheckServiceImpl* DefaultHealthCheckService::GetHealthCheckService() { GPR_ASSERT(impl_ == nullptr); - impl_ = absl::make_unique(this); + impl_ = std::make_unique(this); return impl_.get(); } diff --git a/src/cpp/server/load_reporter/load_reporter_async_service_impl.cc b/src/cpp/server/load_reporter/load_reporter_async_service_impl.cc index 05d7f033f81..d6af157f02f 100644 --- a/src/cpp/server/load_reporter/load_reporter_async_service_impl.cc +++ b/src/cpp/server/load_reporter/load_reporter_async_service_impl.cc @@ -25,8 +25,6 @@ #include #include -#include "absl/memory/memory.h" - #include #include #include @@ -46,12 +44,12 @@ LoadReporterAsyncServiceImpl::LoadReporterAsyncServiceImpl( std::unique_ptr cq) : cq_(std::move(cq)) { thread_ = - absl::make_unique("server_load_reporting", Work, this); + std::make_unique("server_load_reporting", Work, this); std::unique_ptr cpu_stats_provider = nullptr; #if defined(GPR_LINUX) || defined(GPR_WINDOWS) || defined(GPR_APPLE) - cpu_stats_provider = absl::make_unique(); + cpu_stats_provider = std::make_unique(); #endif - load_reporter_ = absl::make_unique( + load_reporter_ = std::make_unique( kFeedbackSampleWindowSeconds, std::unique_ptr(new CensusViewProviderDefaultImpl()), std::move(cpu_stats_provider)); @@ -80,7 +78,7 @@ void LoadReporterAsyncServiceImpl::ScheduleNextFetchAndSample() { if (shutdown_) return; // TODO(juanlishen): Improve the Alarm implementation to reuse a single // instance for multiple events. - next_fetch_and_sample_alarm_ = absl::make_unique(); + next_fetch_and_sample_alarm_ = std::make_unique(); next_fetch_and_sample_alarm_->Set(cq_.get(), next_fetch_and_sample_time, this); } @@ -280,7 +278,7 @@ void LoadReporterAsyncServiceImpl::ReportLoadHandler::ScheduleNextReport( std::move(self)); // TODO(juanlishen): Improve the Alarm implementation to reuse a single // instance for multiple events. - next_report_alarm_ = absl::make_unique(); + next_report_alarm_ = std::make_unique(); next_report_alarm_->Set(cq_, next_report_time, &next_outbound_); } gpr_log(GPR_DEBUG, diff --git a/src/cpp/server/orca/orca_interceptor.cc b/src/cpp/server/orca/orca_interceptor.cc index 09afa6ef828..4873ded7012 100644 --- a/src/cpp/server/orca/orca_interceptor.cc +++ b/src/cpp/server/orca/orca_interceptor.cc @@ -23,7 +23,6 @@ #include #include -#include "absl/memory/memory.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" @@ -67,7 +66,7 @@ Interceptor* OrcaServerInterceptorFactory::CreateServerInterceptor( void OrcaServerInterceptorFactory::Register(grpc::ServerBuilder* builder) { builder->internal_interceptor_creators_.push_back( - absl::make_unique()); + std::make_unique()); } void EnableCallMetricRecording(grpc::ServerBuilder* builder) { diff --git a/src/cpp/server/server_cc.cc b/src/cpp/server/server_cc.cc index fc4bb5c5da8..52f671980bb 100644 --- a/src/cpp/server/server_cc.cc +++ b/src/cpp/server/server_cc.cc @@ -28,7 +28,6 @@ #include #include -#include "absl/memory/memory.h" #include "absl/status/status.h" #include @@ -827,7 +826,7 @@ class Server::SyncRequestThreadManager : public grpc::ThreadManager { void AddUnknownSyncMethod() { if (has_sync_method_) { - unknown_method_ = absl::make_unique( + unknown_method_ = std::make_unique( "unknown", grpc::internal::RpcMethod::BIDI_STREAMING, new grpc::internal::UnknownMethodHandler(kUnknownRpcMethod)); grpc_core::Server::FromC(server_->server()) @@ -1149,7 +1148,7 @@ void Server::Start(grpc::ServerCompletionQueue** cqs, size_t num_cqs) { // explicit one. if (health_check_service_ == nullptr && !health_check_service_disabled_ && grpc::DefaultHealthCheckServiceEnabled()) { - auto default_hc_service = absl::make_unique(); + auto default_hc_service = std::make_unique(); auto* hc_service_impl = default_hc_service->GetHealthCheckService(); health_check_service_ = std::move(default_hc_service); RegisterService(nullptr, hc_service_impl); @@ -1182,7 +1181,7 @@ void Server::Start(grpc::ServerCompletionQueue** cqs, size_t num_cqs) { bool unknown_rpc_needed = !has_async_generic_service_ && !has_callback_generic_service_; if (unknown_rpc_needed && has_callback_methods_) { - unimplemented_service_ = absl::make_unique(); + unimplemented_service_ = std::make_unique(); RegisterCallbackGenericService(unimplemented_service_.get()); unknown_rpc_needed = false; } @@ -1207,7 +1206,7 @@ void Server::Start(grpc::ServerCompletionQueue** cqs, size_t num_cqs) { // to deal with the case of thread exhaustion if (sync_server_cqs_ != nullptr && !sync_server_cqs_->empty()) { resource_exhausted_handler_ = - absl::make_unique( + std::make_unique( kServerThreadpoolExhausted); } diff --git a/test/core/channel/channelz_test.cc b/test/core/channel/channelz_test.cc index 4e465f6840c..592432a73f5 100644 --- a/test/core/channel/channelz_test.cc +++ b/test/core/channel/channelz_test.cc @@ -465,8 +465,8 @@ TEST_F(ChannelzRegistryBasedTest, GetTopChannelsUuidAfterCompaction) { // these will delete and unregister themselves after this block. std::vector> odd_channels; for (int i = 0; i < kLoopIterations; i++) { - odd_channels.push_back(absl::make_unique()); - even_channels.push_back(absl::make_unique()); + odd_channels.push_back(std::make_unique()); + even_channels.push_back(std::make_unique()); } } std::string json_str = ChannelzRegistry::GetTopChannels(0); diff --git a/test/core/client_channel/resolvers/binder_resolver_test.cc b/test/core/client_channel/resolvers/binder_resolver_test.cc index 99b9669e3a1..0de1544572e 100644 --- a/test/core/client_channel/resolvers/binder_resolver_test.cc +++ b/test/core/client_channel/resolvers/binder_resolver_test.cc @@ -112,7 +112,7 @@ class BinderResolverTest : public ::testing::Test { grpc_core::ResolverArgs args; args.uri = std::move(*uri); args.result_handler = - absl::make_unique(expected_path); + std::make_unique(expected_path); grpc_core::OrphanablePtr resolver = factory_->CreateResolver(std::move(args)); ASSERT_TRUE(resolver != nullptr); @@ -127,8 +127,7 @@ class BinderResolverTest : public ::testing::Test { ASSERT_TRUE(uri.ok()) << uri.status().ToString(); grpc_core::ResolverArgs args; args.uri = std::move(*uri); - args.result_handler = - absl::make_unique(); + args.result_handler = std::make_unique(); grpc_core::OrphanablePtr resolver = factory_->CreateResolver(std::move(args)); EXPECT_TRUE(resolver == nullptr); diff --git a/test/core/client_channel/resolvers/dns_resolver_cooldown_test.cc b/test/core/client_channel/resolvers/dns_resolver_cooldown_test.cc index d4fc5084320..3c9e7722a19 100644 --- a/test/core/client_channel/resolvers/dns_resolver_cooldown_test.cc +++ b/test/core/client_channel/resolvers/dns_resolver_cooldown_test.cc @@ -391,7 +391,7 @@ TEST(DnsResolverCooldownTest, MainTest) { g_default_dns_lookup_ares = grpc_dns_lookup_hostname_ares; grpc_dns_lookup_hostname_ares = test_dns_lookup_ares; grpc_core::ResetDNSResolver( - absl::make_unique(grpc_core::GetDNSResolver())); + std::make_unique(grpc_core::GetDNSResolver())); test_cooldown(); diff --git a/test/core/client_channel/resolvers/dns_resolver_test.cc b/test/core/client_channel/resolvers/dns_resolver_test.cc index 48ecfaf9e4c..61a42044ee1 100644 --- a/test/core/client_channel/resolvers/dns_resolver_test.cc +++ b/test/core/client_channel/resolvers/dns_resolver_test.cc @@ -52,7 +52,7 @@ static void test_succeeds(grpc_core::ResolverFactory* factory, grpc_core::ResolverArgs args; args.uri = std::move(*uri); args.work_serializer = *g_work_serializer; - args.result_handler = absl::make_unique(); + args.result_handler = std::make_unique(); grpc_core::OrphanablePtr resolver = factory->CreateResolver(std::move(args)); ASSERT_NE(resolver, nullptr); @@ -71,7 +71,7 @@ static void test_fails(grpc_core::ResolverFactory* factory, grpc_core::ResolverArgs args; args.uri = std::move(*uri); args.work_serializer = *g_work_serializer; - args.result_handler = absl::make_unique(); + args.result_handler = std::make_unique(); grpc_core::OrphanablePtr resolver = factory->CreateResolver(std::move(args)); ASSERT_EQ(resolver, nullptr); diff --git a/test/core/client_channel/resolvers/sockaddr_resolver_test.cc b/test/core/client_channel/resolvers/sockaddr_resolver_test.cc index 52c02f823a3..80ffd9584cd 100644 --- a/test/core/client_channel/resolvers/sockaddr_resolver_test.cc +++ b/test/core/client_channel/resolvers/sockaddr_resolver_test.cc @@ -52,7 +52,7 @@ static void test_succeeds(grpc_core::ResolverFactory* factory, grpc_core::ResolverArgs args; args.uri = std::move(*uri); args.work_serializer = *g_work_serializer; - args.result_handler = absl::make_unique(); + args.result_handler = std::make_unique(); grpc_core::OrphanablePtr resolver = factory->CreateResolver(std::move(args)); ASSERT_NE(resolver, nullptr); @@ -75,7 +75,7 @@ static void test_fails(grpc_core::ResolverFactory* factory, grpc_core::ResolverArgs args; args.uri = std::move(*uri); args.work_serializer = *g_work_serializer; - args.result_handler = absl::make_unique(); + args.result_handler = std::make_unique(); grpc_core::OrphanablePtr resolver = factory->CreateResolver(std::move(args)); ASSERT_EQ(resolver, nullptr); diff --git a/test/core/client_channel/service_config_test.cc b/test/core/client_channel/service_config_test.cc index 3604d2820a6..03b4c972879 100644 --- a/test/core/client_channel/service_config_test.cc +++ b/test/core/client_channel/service_config_test.cc @@ -77,7 +77,7 @@ class TestParser1 : public ServiceConfigParser::Parser { if (value == -1) { return absl::InvalidArgumentError(InvalidValueErrorMessage()); } - return absl::make_unique(value); + return std::make_unique(value); } return nullptr; } @@ -109,7 +109,7 @@ class TestParser2 : public ServiceConfigParser::Parser { if (value == -1) { return absl::InvalidArgumentError(InvalidValueErrorMessage()); } - return absl::make_unique(value); + return std::make_unique(value); } return nullptr; } @@ -155,9 +155,9 @@ class ServiceConfigTest : public ::testing::Test { builder_ = std::make_unique( [](CoreConfiguration::Builder* builder) { builder->service_config_parser()->RegisterParser( - absl::make_unique()); + std::make_unique()); builder->service_config_parser()->RegisterParser( - absl::make_unique()); + std::make_unique()); }); EXPECT_EQ(CoreConfiguration::Get().service_config_parser().GetParserIndex( "test_parser_1"), @@ -411,9 +411,9 @@ TEST(ServiceConfigParserTest, DoubleRegistration) { CoreConfiguration::WithSubstituteBuilder builder( [](CoreConfiguration::Builder* builder) { builder->service_config_parser()->RegisterParser( - absl::make_unique("xyzabc")); + std::make_unique("xyzabc")); builder->service_config_parser()->RegisterParser( - absl::make_unique("xyzabc")); + std::make_unique("xyzabc")); }), "xyzabc.*already registered"); } @@ -425,9 +425,9 @@ class ErroredParsersScopingTest : public ::testing::Test { builder_ = std::make_unique( [](CoreConfiguration::Builder* builder) { builder->service_config_parser()->RegisterParser( - absl::make_unique("ep1")); + std::make_unique("ep1")); builder->service_config_parser()->RegisterParser( - absl::make_unique("ep2")); + std::make_unique("ep2")); }); EXPECT_EQ( CoreConfiguration::Get().service_config_parser().GetParserIndex("ep1"), @@ -755,7 +755,7 @@ class RetryParserTest : public ::testing::Test { builder_ = std::make_unique( [](CoreConfiguration::Builder* builder) { builder->service_config_parser()->RegisterParser( - absl::make_unique()); + std::make_unique()); }); EXPECT_EQ(CoreConfiguration::Get().service_config_parser().GetParserIndex( "retry"), @@ -1449,7 +1449,7 @@ class MessageSizeParserTest : public ::testing::Test { builder_ = std::make_unique( [](CoreConfiguration::Builder* builder) { builder->service_config_parser()->RegisterParser( - absl::make_unique()); + std::make_unique()); }); EXPECT_EQ(CoreConfiguration::Get().service_config_parser().GetParserIndex( "message_size"), diff --git a/test/core/end2end/BUILD b/test/core/end2end/BUILD index 99b034b04e3..ae5341d688c 100644 --- a/test/core/end2end/BUILD +++ b/test/core/end2end/BUILD @@ -160,7 +160,6 @@ grpc_cc_test( name = "goaway_server_test", srcs = ["goaway_server_test.cc"], external_deps = [ - "absl/memory", "absl/status", "absl/status:statusor", "absl/strings", @@ -202,7 +201,6 @@ grpc_cc_test( grpc_cc_test( name = "invalid_call_argument_test", srcs = ["invalid_call_argument_test.cc"], - external_deps = ["absl/memory"], language = "C++", deps = [ "cq_verifier", diff --git a/test/core/end2end/fuzzers/api_fuzzer.cc b/test/core/end2end/fuzzers/api_fuzzer.cc index 3c5deda61a6..e78b1d4807b 100644 --- a/test/core/end2end/fuzzers/api_fuzzer.cc +++ b/test/core/end2end/fuzzers/api_fuzzer.cc @@ -29,7 +29,6 @@ #include #include -#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/string_view.h" @@ -119,7 +118,7 @@ static void finish_resolve(void* arg, grpc_error_handle error) { addr_req* r = static_cast(arg); if (error.ok() && 0 == strcmp(r->addr, "server")) { - *r->addresses = absl::make_unique(); + *r->addresses = std::make_unique(); grpc_resolved_address fake_resolved_address; GPR_ASSERT( grpc_parse_ipv4_hostport("1.2.3.4:5", &fake_resolved_address, false)); @@ -823,7 +822,7 @@ DEFINE_PROTO_FUZZER(const api_fuzzer::Msg& msg) { grpc_event_engine::experimental::SetEventEngineFactory( [actions = msg.event_engine_actions()]() { - return absl::make_unique( + return std::make_unique( FuzzingEventEngine::Options(), actions); }); auto engine = @@ -836,7 +835,7 @@ DEFINE_PROTO_FUZZER(const api_fuzzer::Msg& msg) { grpc_core::Executor::SetThreadingAll(false); } grpc_core::ResetDNSResolver( - absl::make_unique(engine.get())); + std::make_unique(engine.get())); grpc_dns_lookup_hostname_ares = my_dns_lookup_ares; grpc_cancel_ares_request = my_cancel_ares_request; diff --git a/test/core/end2end/goaway_server_test.cc b/test/core/end2end/goaway_server_test.cc index 6f3c4bb770b..bde337b0130 100644 --- a/test/core/end2end/goaway_server_test.cc +++ b/test/core/end2end/goaway_server_test.cc @@ -26,7 +26,6 @@ #include #include -#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" @@ -187,7 +186,7 @@ static grpc_ares_request* my_dns_lookup_ares( gpr_mu_unlock(&g_mu); error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("Forced Failure"); } else { - *addresses = absl::make_unique(); + *addresses = std::make_unique(); grpc_sockaddr_in sa; memset(&sa, 0, sizeof(sa)); sa.sin_family = GRPC_AF_INET; @@ -216,7 +215,7 @@ int main(int argc, char** argv) { gpr_mu_init(&g_mu); grpc_init(); grpc_core::ResetDNSResolver( - absl::make_unique(grpc_core::GetDNSResolver())); + std::make_unique(grpc_core::GetDNSResolver())); iomgr_dns_lookup_ares = grpc_dns_lookup_hostname_ares; iomgr_cancel_ares_request = grpc_cancel_ares_request; grpc_dns_lookup_hostname_ares = my_dns_lookup_ares; diff --git a/test/core/end2end/invalid_call_argument_test.cc b/test/core/end2end/invalid_call_argument_test.cc index a8fc056d973..2f930dd0ccd 100644 --- a/test/core/end2end/invalid_call_argument_test.cc +++ b/test/core/end2end/invalid_call_argument_test.cc @@ -26,8 +26,6 @@ #include #include -#include "absl/memory/memory.h" - #include #include #include @@ -72,7 +70,7 @@ static void prepare_test(int is_client) { grpc_metadata_array_init(&g_state.trailing_metadata_recv); g_state.deadline = grpc_timeout_seconds_to_deadline(5); g_state.cq = grpc_completion_queue_create_for_next(nullptr); - g_state.cqv = absl::make_unique(g_state.cq); + g_state.cqv = std::make_unique(g_state.cq); g_state.details = grpc_empty_slice(); memset(g_state.ops, 0, sizeof(g_state.ops)); diff --git a/test/core/end2end/tests/max_connection_age.cc b/test/core/end2end/tests/max_connection_age.cc index 5d3ca8a4c3b..52143fe8e93 100644 --- a/test/core/end2end/tests/max_connection_age.cc +++ b/test/core/end2end/tests/max_connection_age.cc @@ -22,8 +22,6 @@ #include -#include "absl/memory/memory.h" - #include #include #include @@ -87,7 +85,7 @@ static void end_test(grpc_end2end_test_fixture* f) { static void test_max_age_forcibly_close(grpc_end2end_test_config config) { grpc_end2end_test_fixture f = config.create_fixture(nullptr, nullptr); - auto cqv = absl::make_unique(f.cq); + auto cqv = std::make_unique(f.cq); grpc_arg server_a[3]; server_a[0].type = GRPC_ARG_INTEGER; server_a[0].key = const_cast(GRPC_ARG_MAX_CONNECTION_AGE_MS); @@ -230,7 +228,7 @@ static void test_max_age_forcibly_close(grpc_end2end_test_config config) { static void test_max_age_gracefully_close(grpc_end2end_test_config config) { grpc_end2end_test_fixture f = config.create_fixture(nullptr, nullptr); - auto cqv = absl::make_unique(f.cq); + auto cqv = std::make_unique(f.cq); grpc_arg server_a[3]; server_a[0].type = GRPC_ARG_INTEGER; server_a[0].key = const_cast(GRPC_ARG_MAX_CONNECTION_AGE_MS); diff --git a/test/core/end2end/tests/retry_lb_drop.cc b/test/core/end2end/tests/retry_lb_drop.cc index c1c627464b1..ab5bce8f89b 100644 --- a/test/core/end2end/tests/retry_lb_drop.cc +++ b/test/core/end2end/tests/retry_lb_drop.cc @@ -22,7 +22,6 @@ #include #include -#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/string_view.h" @@ -61,7 +60,7 @@ class DropPolicy : public LoadBalancingPolicy { absl::Status UpdateLocked(UpdateArgs) override { channel_control_helper()->UpdateState(GRPC_CHANNEL_READY, absl::Status(), - absl::make_unique()); + std::make_unique()); return absl::OkStatus(); } @@ -102,7 +101,7 @@ std::vector* g_pick_args_vector = nullptr; void RegisterDropPolicy(CoreConfiguration::Builder* builder) { builder->lb_policy_registry()->RegisterLoadBalancingPolicyFactory( - absl::make_unique()); + std::make_unique()); } } // namespace diff --git a/test/core/end2end/tests/server_streaming.cc b/test/core/end2end/tests/server_streaming.cc index 4908d4ccbe7..f21c6008956 100644 --- a/test/core/end2end/tests/server_streaming.cc +++ b/test/core/end2end/tests/server_streaming.cc @@ -21,8 +21,6 @@ #include -#include "absl/memory/memory.h" - #include #include #include @@ -99,7 +97,7 @@ static void test_server_streaming(grpc_end2end_test_config config, begin_test(config, "test_server_streaming", nullptr, nullptr); grpc_call* c; grpc_call* s; - auto cqv = absl::make_unique(f.cq); + auto cqv = std::make_unique(f.cq); grpc_op ops[6]; grpc_op* op; grpc_metadata_array initial_metadata_recv; diff --git a/test/core/event_engine/default_engine_methods_test.cc b/test/core/event_engine/default_engine_methods_test.cc index 94e6fbf8be3..b77e4956796 100644 --- a/test/core/event_engine/default_engine_methods_test.cc +++ b/test/core/event_engine/default_engine_methods_test.cc @@ -79,7 +79,7 @@ TEST_F(DefaultEngineTest, SharedPtrGlobalEventEngineLifetimesAreValid) { int create_count = 0; grpc_event_engine::experimental::SetEventEngineFactory([&create_count] { ++create_count; - return absl::make_unique(); + return std::make_unique(); }); std::shared_ptr ee2; { diff --git a/test/core/event_engine/factory_test.cc b/test/core/event_engine/factory_test.cc index a4daabe9977..cadb75db405 100644 --- a/test/core/event_engine/factory_test.cc +++ b/test/core/event_engine/factory_test.cc @@ -40,7 +40,7 @@ TEST_F(EventEngineFactoryTest, CustomFactoryIsUsed) { int counter{0}; SetEventEngineFactory([&counter] { ++counter; - return absl::make_unique(); + return std::make_unique(); }); auto ee1 = GetDefaultEventEngine(); ASSERT_EQ(counter, 1); @@ -56,7 +56,7 @@ TEST_F(EventEngineFactoryTest, FactoryResetWorks) { SetEventEngineFactory([&counter]() -> std::unique_ptr { // called at most twice; EXPECT_LE(++counter, 2); - return absl::make_unique(); + return std::make_unique(); }); auto custom_ee = GetDefaultEventEngine(); ASSERT_EQ(counter, 1); diff --git a/test/core/event_engine/posix/event_poller_posix_test.cc b/test/core/event_engine/posix/event_poller_posix_test.cc index 9d8b30a9143..3718eedaa36 100644 --- a/test/core/event_engine/posix/event_poller_posix_test.cc +++ b/test/core/event_engine/posix/event_poller_posix_test.cc @@ -391,10 +391,10 @@ std::string TestScenarioName( class EventPollerTest : public ::testing::TestWithParam { void SetUp() override { engine_ = - absl::make_unique(); + std::make_unique(); EXPECT_NE(engine_, nullptr); scheduler_ = - absl::make_unique( + std::make_unique( engine_.get()); EXPECT_NE(scheduler_, nullptr); GPR_GLOBAL_CONFIG_SET(grpc_poll_strategy, GetParam().c_str()); diff --git a/test/core/event_engine/test_suite/client_test.cc b/test/core/event_engine/test_suite/client_test.cc index 031766db1ec..dc9f8a7a842 100644 --- a/test/core/event_engine/test_suite/client_test.cc +++ b/test/core/event_engine/test_suite/client_test.cc @@ -82,7 +82,7 @@ TEST_F(EventEngineClientTest, ConnectToNonExistentListenerTest) { grpc_core::ExecCtx ctx; auto test_ee = this->NewEventEngine(); grpc_core::Notification signal; - auto memory_quota = absl::make_unique("bar"); + auto memory_quota = std::make_unique("bar"); std::string target_addr = absl::StrCat( "ipv6:[::1]:", std::to_string(grpc_pick_unused_port_or_die())); // Create a test EventEngine client endpoint and connect to a non existent @@ -107,7 +107,7 @@ TEST_F(EventEngineClientTest, ConnectExchangeBidiDataTransferTest) { grpc_core::ExecCtx ctx; auto oracle_ee = this->NewOracleEventEngine(); auto test_ee = this->NewEventEngine(); - auto memory_quota = absl::make_unique("bar"); + auto memory_quota = std::make_unique("bar"); std::string target_addr = absl::StrCat( "ipv6:[::1]:", std::to_string(grpc_pick_unused_port_or_die())); std::unique_ptr client_endpoint; @@ -127,7 +127,7 @@ TEST_F(EventEngineClientTest, ConnectExchangeBidiDataTransferTest) { auto status = oracle_ee->CreateListener( std::move(accept_cb), [](absl::Status status) { GPR_ASSERT(status.ok()); }, config, - absl::make_unique("foo")); + std::make_unique("foo")); EXPECT_TRUE(status.ok()); std::unique_ptr listener = std::move(*status); @@ -176,7 +176,7 @@ TEST_F(EventEngineClientTest, MultipleIPv6ConnectionsToOneOracleListenerTest) { static constexpr int kNumConnections = 10; // M auto oracle_ee = this->NewOracleEventEngine(); auto test_ee = this->NewEventEngine(); - auto memory_quota = absl::make_unique("bar"); + auto memory_quota = std::make_unique("bar"); std::unique_ptr server_endpoint; // Notifications can only be fired once, so they are newed every loop grpc_core::Notification* server_signal = new grpc_core::Notification(); @@ -195,7 +195,7 @@ TEST_F(EventEngineClientTest, MultipleIPv6ConnectionsToOneOracleListenerTest) { auto status = oracle_ee->CreateListener( std::move(accept_cb), [](absl::Status status) { GPR_ASSERT(status.ok()); }, config, - absl::make_unique("foo")); + std::make_unique("foo")); EXPECT_TRUE(status.ok()); std::unique_ptr listener = std::move(*status); diff --git a/test/core/event_engine/test_suite/event_engine_test_utils.cc b/test/core/event_engine/test_suite/event_engine_test_utils.cc index a754339e26b..7f68036dd8a 100644 --- a/test/core/event_engine/test_suite/event_engine_test_utils.cc +++ b/test/core/event_engine/test_suite/event_engine_test_utils.cc @@ -139,7 +139,7 @@ absl::Status ConnectionManager::BindAndStartListener( auto status = event_engine->CreateListener( std::move(accept_cb), [](absl::Status status) { GPR_ASSERT(status.ok()); }, config, - absl::make_unique("foo")); + std::make_unique("foo")); if (!status.ok()) { return status.status(); } diff --git a/test/core/event_engine/test_suite/fuzzing_event_engine_test.cc b/test/core/event_engine/test_suite/fuzzing_event_engine_test.cc index d1b91fc283b..e428912743b 100644 --- a/test/core/event_engine/test_suite/fuzzing_event_engine_test.cc +++ b/test/core/event_engine/test_suite/fuzzing_event_engine_test.cc @@ -66,7 +66,7 @@ int main(int argc, char** argv) { testing::InitGoogleTest(&argc, argv); SetEventEngineFactories( []() { - return absl::make_unique< + return std::make_unique< grpc_event_engine::experimental::ThreadedFuzzingEventEngine>(); }, nullptr); diff --git a/test/core/event_engine/test_suite/oracle_event_engine_posix.cc b/test/core/event_engine/test_suite/oracle_event_engine_posix.cc index cdc2a1a2057..4459c201e81 100644 --- a/test/core/event_engine/test_suite/oracle_event_engine_posix.cc +++ b/test/core/event_engine/test_suite/oracle_event_engine_posix.cc @@ -253,7 +253,7 @@ void PosixOracleEndpoint::ProcessReadOperations() { gpr_log(GPR_INFO, "Starting thread to process read ops ..."); while (true) { read_op_signal_->WaitForNotification(); - read_op_signal_ = absl::make_unique(); + read_op_signal_ = std::make_unique(); auto read_op = std::exchange(read_ops_channel_, ReadOperation()); if (!read_op.IsValid()) { read_op(std::string(), absl::CancelledError("Closed")); @@ -274,7 +274,7 @@ void PosixOracleEndpoint::ProcessWriteOperations() { gpr_log(GPR_INFO, "Starting thread to process write ops ..."); while (true) { write_op_signal_->WaitForNotification(); - write_op_signal_ = absl::make_unique(); + write_op_signal_ = std::make_unique(); auto write_op = std::exchange(write_ops_channel_, WriteOperation()); if (!write_op.IsValid()) { write_op(absl::CancelledError("Closed")); diff --git a/test/core/event_engine/test_suite/oracle_event_engine_posix_test.cc b/test/core/event_engine/test_suite/oracle_event_engine_posix_test.cc index 2a9f4bd3945..c4e2d53ffc9 100644 --- a/test/core/event_engine/test_suite/oracle_event_engine_posix_test.cc +++ b/test/core/event_engine/test_suite/oracle_event_engine_posix_test.cc @@ -20,7 +20,7 @@ int main(int argc, char** argv) { testing::InitGoogleTest(&argc, argv); grpc::testing::TestEnvironment env(&argc, argv); auto ee_factory = []() { - return absl::make_unique< + return std::make_unique< grpc_event_engine::experimental::PosixOracleEventEngine>(); }; SetEventEngineFactories(/*ee_factory=*/ee_factory, diff --git a/test/core/event_engine/test_suite/posix_event_engine_test.cc b/test/core/event_engine/test_suite/posix_event_engine_test.cc index 5b9fb474a8a..a023717338b 100644 --- a/test/core/event_engine/test_suite/posix_event_engine_test.cc +++ b/test/core/event_engine/test_suite/posix_event_engine_test.cc @@ -22,7 +22,7 @@ int main(int argc, char** argv) { grpc::testing::TestEnvironment env(&argc, argv); SetEventEngineFactories( []() { - return absl::make_unique< + return std::make_unique< grpc_event_engine::experimental::PosixEventEngine>(); }, nullptr); diff --git a/test/core/event_engine/test_suite/windows_event_engine_test.cc b/test/core/event_engine/test_suite/windows_event_engine_test.cc index f39cd76f8c4..fc6d931fdcf 100644 --- a/test/core/event_engine/test_suite/windows_event_engine_test.cc +++ b/test/core/event_engine/test_suite/windows_event_engine_test.cc @@ -23,7 +23,7 @@ int main(int argc, char** argv) { testing::InitGoogleTest(&argc, argv); grpc::testing::TestEnvironment env(&argc, argv); auto factory = []() { - return absl::make_unique< + return std::make_unique< grpc_event_engine::experimental::WindowsEventEngine>(); }; SetEventEngineFactories(factory, factory); diff --git a/test/core/filters/filter_fuzzer.cc b/test/core/filters/filter_fuzzer.cc index 0b7648fa505..4a97ebed930 100644 --- a/test/core/filters/filter_fuzzer.cc +++ b/test/core/filters/filter_fuzzer.cc @@ -295,7 +295,7 @@ class MainLoop { case filter_fuzzer::Action::kCreateCall: calls_.emplace( action.call(), - absl::make_unique(this, action.call(), action.create_call())); + std::make_unique(this, action.call(), action.create_call())); break; case filter_fuzzer::Action::kReceiveInitialMetadata: if (auto* call = GetCall(action.call())) { @@ -422,7 +422,7 @@ class MainLoop { if (promise_.has_value()) final_info_.reset(); std::unique_ptr final_info; if (final_info_) { - final_info = absl::make_unique(); + final_info = std::make_unique(); final_info->final_status = static_cast(final_info_->status()); final_info->error_string = final_info_->error_string().c_str(); @@ -482,7 +482,7 @@ class MainLoop { } void SetFinalInfo(filter_fuzzer::FinalInfo final_info) { - final_info_ = absl::make_unique(final_info); + final_info_ = std::make_unique(final_info); } private: @@ -521,7 +521,7 @@ class MainLoop { absl::optional> LoadMetadata( const filter_fuzzer::Metadata& metadata, std::unique_ptr* out) { if (*out != nullptr) return absl::nullopt; - *out = absl::make_unique(arena_.get()); + *out = std::make_unique(arena_.get()); for (const auto& md : metadata.metadata()) { (*out)->Append(md.key(), Slice::FromCopiedString(md.value()), [](absl::string_view, const Slice&) {}); diff --git a/test/core/gprpp/work_serializer_test.cc b/test/core/gprpp/work_serializer_test.cc index 519bd30d4da..07be3c21b72 100644 --- a/test/core/gprpp/work_serializer_test.cc +++ b/test/core/gprpp/work_serializer_test.cc @@ -115,7 +115,7 @@ TEST(WorkSerializerTest, ExecuteMany) { { std::vector> threads; for (size_t i = 0; i < 10; ++i) { - threads.push_back(absl::make_unique(&lock)); + threads.push_back(std::make_unique(&lock)); } } } @@ -176,7 +176,7 @@ TEST(WorkSerializerTest, ExecuteManyScheduleAndDrain) { { std::vector> threads; for (size_t i = 0; i < 10; ++i) { - threads.push_back(absl::make_unique(&lock)); + threads.push_back(std::make_unique(&lock)); } } } @@ -187,9 +187,9 @@ TEST(WorkSerializerTest, ExecuteManyMixedRunScheduleAndDrain) { std::vector> run_threads; std::vector> schedule_threads; for (size_t i = 0; i < 10; ++i) { - run_threads.push_back(absl::make_unique(&lock)); + run_threads.push_back(std::make_unique(&lock)); schedule_threads.push_back( - absl::make_unique(&lock)); + std::make_unique(&lock)); } } } diff --git a/test/core/handshake/readahead_handshaker_server_ssl.cc b/test/core/handshake/readahead_handshaker_server_ssl.cc index d80512389f1..6b1c12d9453 100644 --- a/test/core/handshake/readahead_handshaker_server_ssl.cc +++ b/test/core/handshake/readahead_handshaker_server_ssl.cc @@ -84,7 +84,7 @@ TEST(HandshakeServerWithReadaheadHandshakerTest, MainTest) { BuildCoreConfiguration(builder); builder->handshaker_registry()->RegisterHandshakerFactory( true /* at_start */, grpc_core::HANDSHAKER_SERVER, - absl::make_unique()); + std::make_unique()); }); grpc_init(); diff --git a/test/core/iomgr/stranded_event_test.cc b/test/core/iomgr/stranded_event_test.cc index cdf6be1f28a..c2b8986200f 100644 --- a/test/core/iomgr/stranded_event_test.cc +++ b/test/core/iomgr/stranded_event_test.cc @@ -334,7 +334,7 @@ TEST(Pollers, TestReadabilityNotificationsDontGetStrandedOnOneCq) { // hit test timeouts because of that. test_servers.reserve(kNumCalls); for (int i = 0; i < kNumCalls; i++) { - test_servers.push_back(absl::make_unique()); + test_servers.push_back(std::make_unique()); } for (int i = 0; i < kNumCalls; i++) { auto test_server = test_servers[i].get(); @@ -374,7 +374,7 @@ TEST(Pollers, TestReadabilityNotificationsDontGetStrandedOnOneCq) { channel, nullptr, GRPC_PROPAGATE_DEFAULTS, cq, grpc_slice_from_static_string("/foo"), nullptr, gpr_inf_future(GPR_CLOCK_REALTIME), nullptr); - auto test_call = absl::make_unique(channel, call, cq); + auto test_call = std::make_unique(channel, call, cq); // Start a call, and ensure that round_robin load balancing is configured StartCall(test_call.get()); // Make sure the test is doing what it's meant to be doing diff --git a/test/core/promise/for_each_test.cc b/test/core/promise/for_each_test.cc index a47997f2724..189814b620b 100644 --- a/test/core/promise/for_each_test.cc +++ b/test/core/promise/for_each_test.cc @@ -18,7 +18,6 @@ #include -#include "absl/memory/memory.h" #include "gmock/gmock.h" #include "gtest/gtest.h" @@ -53,7 +52,7 @@ TEST(ForEachTest, SendThriceWithPipe) { [&num_received] { Pipe pipe; auto sender = std::make_shared>>( - absl::make_unique>(std::move(pipe.sender))); + std::make_unique>(std::move(pipe.sender))); return Map( Join( // Push 3 things into a pipe -- 1, 2, then 3 -- then close. diff --git a/test/core/promise/pipe_test.cc b/test/core/promise/pipe_test.cc index 0150503406c..d40ad87fe74 100644 --- a/test/core/promise/pipe_test.cc +++ b/test/core/promise/pipe_test.cc @@ -18,7 +18,6 @@ #include #include -#include "absl/memory/memory.h" #include "absl/status/status.h" #include "gmock/gmock.h" #include "gtest/gtest.h" @@ -100,7 +99,7 @@ TEST(PipeTest, CanSeeClosedOnSend) { Pipe pipe; auto sender = std::move(pipe.sender); auto receiver = std::make_shared>>( - absl::make_unique>(std::move(pipe.receiver))); + std::make_unique>(std::move(pipe.receiver))); return Seq( // Concurrently: // - push 43 into the sender, which will stall because there is no @@ -129,7 +128,7 @@ TEST(PipeTest, CanSeeClosedOnReceive) { [] { Pipe pipe; auto sender = std::make_shared>>( - absl::make_unique>(std::move(pipe.sender))); + std::make_unique>(std::move(pipe.sender))); auto receiver = std::move(pipe.receiver); return Seq( // Concurrently: diff --git a/test/core/resource_quota/BUILD b/test/core/resource_quota/BUILD index 8a85930b983..dfa631441f1 100644 --- a/test/core/resource_quota/BUILD +++ b/test/core/resource_quota/BUILD @@ -23,7 +23,6 @@ grpc_cc_test( name = "arena_test", srcs = ["arena_test.cc"], external_deps = [ - "absl/memory", "absl/strings", "gtest", ], @@ -74,10 +73,7 @@ grpc_cc_test( grpc_cc_test( name = "periodic_update_test", srcs = ["periodic_update_test.cc"], - external_deps = [ - "absl/memory", - "gtest", - ], + external_deps = ["gtest"], flaky = True, language = "c++", uses_event_engine = False, diff --git a/test/core/resource_quota/arena_test.cc b/test/core/resource_quota/arena_test.cc index 28fd4c0ca8d..6cddd6ba82d 100644 --- a/test/core/resource_quota/arena_test.cc +++ b/test/core/resource_quota/arena_test.cc @@ -26,7 +26,6 @@ #include #include -#include "absl/memory/memory.h" #include "absl/strings/str_join.h" #include "gtest/gtest.h" @@ -56,7 +55,7 @@ TEST(ArenaTest, ManagedNew) { ExecCtx exec_ctx; Arena* arena = Arena::Create(1, g_memory_allocator); for (int i = 0; i < 100; i++) { - arena->ManagedNew>(absl::make_unique(i)); + arena->ManagedNew>(std::make_unique(i)); } arena->Destroy(); } @@ -157,7 +156,7 @@ TEST(ArenaTest, ConcurrentManagedNew) { gpr_event_wait(&a->ev_start, gpr_inf_future(GPR_CLOCK_REALTIME)); for (size_t i = 0; i < concurrent_test_iterations(); i++) { a->arena->ManagedNew>( - absl::make_unique(static_cast(i))); + std::make_unique(static_cast(i))); } }, &args); diff --git a/test/core/resource_quota/periodic_update_test.cc b/test/core/resource_quota/periodic_update_test.cc index 81db560a255..c4551098edc 100644 --- a/test/core/resource_quota/periodic_update_test.cc +++ b/test/core/resource_quota/periodic_update_test.cc @@ -21,7 +21,6 @@ #include #include -#include "absl/memory/memory.h" #include "gtest/gtest.h" #include @@ -39,7 +38,7 @@ TEST(PeriodicUpdateTest, SimpleTest) { // Create a periodic update that updates every second. { ExecCtx exec_ctx; - upd = absl::make_unique(Duration::Seconds(1)); + upd = std::make_unique(Duration::Seconds(1)); start = Timestamp::Now(); } // Wait until the first period has elapsed. @@ -87,7 +86,7 @@ TEST(PeriodicUpdate, ThreadTest) { // Create a periodic update that updates every second. { ExecCtx exec_ctx; - upd = absl::make_unique(Duration::Seconds(1)); + upd = std::make_unique(Duration::Seconds(1)); start = Timestamp::Now(); } // Run ten threads all updating the counter continuously, for a total of ten diff --git a/test/core/security/authorization_matchers_test.cc b/test/core/security/authorization_matchers_test.cc index 975e97e178d..c4f6512efe2 100644 --- a/test/core/security/authorization_matchers_test.cc +++ b/test/core/security/authorization_matchers_test.cc @@ -43,12 +43,12 @@ TEST_F(AuthorizationMatchersTest, AndAuthorizationMatcherSuccessfulMatch) { args_.SetLocalEndpoint("ipv4:255.255.255.255:123"); EvaluateArgs args = args_.MakeEvaluateArgs(); std::vector> rules; - rules.push_back(absl::make_unique( - Rbac::Permission::MakeHeaderPermission( + rules.push_back( + std::make_unique(Rbac::Permission::MakeHeaderPermission( HeaderMatcher::Create(/*name=*/"foo", HeaderMatcher::Type::kExact, /*matcher=*/"bar") .value()))); - rules.push_back(absl::make_unique( + rules.push_back(std::make_unique( Rbac::Permission::MakeDestPortPermission(/*port=*/123))); auto matcher = AuthorizationMatcher::Create( Rbac::Permission::MakeAndPermission(std::move(rules))); @@ -60,12 +60,12 @@ TEST_F(AuthorizationMatchersTest, AndAuthorizationMatcherFailedMatch) { args_.SetLocalEndpoint("ipv4:255.255.255.255:123"); EvaluateArgs args = args_.MakeEvaluateArgs(); std::vector> rules; - rules.push_back(absl::make_unique( - Rbac::Permission::MakeHeaderPermission( + rules.push_back( + std::make_unique(Rbac::Permission::MakeHeaderPermission( HeaderMatcher::Create(/*name=*/"foo", HeaderMatcher::Type::kExact, /*matcher=*/"bar") .value()))); - rules.push_back(absl::make_unique( + rules.push_back(std::make_unique( Rbac::Permission::MakeDestPortPermission(/*port=*/123))); auto matcher = AuthorizationMatcher::Create( Rbac::Permission(Rbac::Permission::MakeAndPermission(std::move(rules)))); @@ -78,12 +78,12 @@ TEST_F(AuthorizationMatchersTest, OrAuthorizationMatcherSuccessfulMatch) { args_.SetLocalEndpoint("ipv4:255.255.255.255:123"); EvaluateArgs args = args_.MakeEvaluateArgs(); std::vector> rules; - rules.push_back(absl::make_unique( - Rbac::Permission::MakeHeaderPermission( + rules.push_back( + std::make_unique(Rbac::Permission::MakeHeaderPermission( HeaderMatcher::Create(/*name=*/"foo", HeaderMatcher::Type::kExact, /*matcher=*/"bar") .value()))); - rules.push_back(absl::make_unique( + rules.push_back(std::make_unique( Rbac::Permission::MakeDestPortPermission(/*port=*/456))); auto matcher = AuthorizationMatcher::Create( Rbac::Permission(Rbac::Permission::MakeOrPermission(std::move(rules)))); @@ -95,8 +95,8 @@ TEST_F(AuthorizationMatchersTest, OrAuthorizationMatcherFailedMatch) { args_.AddPairToMetadata("foo", "not_bar"); EvaluateArgs args = args_.MakeEvaluateArgs(); std::vector> rules; - rules.push_back(absl::make_unique( - Rbac::Permission::MakeHeaderPermission( + rules.push_back( + std::make_unique(Rbac::Permission::MakeHeaderPermission( HeaderMatcher::Create(/*name=*/"foo", HeaderMatcher::Type::kExact, /*matcher=*/"bar") .value()))); @@ -135,18 +135,18 @@ TEST_F(AuthorizationMatchersTest, HybridAuthorizationMatcherSuccessfulMatch) { args_.SetLocalEndpoint("ipv4:255.255.255.255:123"); EvaluateArgs args = args_.MakeEvaluateArgs(); std::vector> sub_and_rules; - sub_and_rules.push_back(absl::make_unique( - Rbac::Permission::MakeHeaderPermission( + sub_and_rules.push_back( + std::make_unique(Rbac::Permission::MakeHeaderPermission( HeaderMatcher::Create(/*name=*/"foo", HeaderMatcher::Type::kExact, /*matcher=*/"bar") .value()))); std::vector> sub_or_rules; - sub_or_rules.push_back(absl::make_unique( + sub_or_rules.push_back(std::make_unique( Rbac::Permission::MakeDestPortPermission(/*port=*/123))); std::vector> and_rules; - and_rules.push_back(absl::make_unique( + and_rules.push_back(std::make_unique( Rbac::Permission::MakeAndPermission(std::move(sub_and_rules)))); - and_rules.push_back(absl::make_unique( + and_rules.push_back(std::make_unique( Rbac::Permission::MakeOrPermission(std::move(std::move(sub_or_rules))))); auto matcher = AuthorizationMatcher::Create(Rbac::Permission( Rbac::Permission::MakeAndPermission(std::move(and_rules)))); @@ -158,24 +158,24 @@ TEST_F(AuthorizationMatchersTest, HybridAuthorizationMatcherFailedMatch) { args_.SetLocalEndpoint("ipv4:255.255.255.255:123"); EvaluateArgs args = args_.MakeEvaluateArgs(); std::vector> sub_and_rules; - sub_and_rules.push_back(absl::make_unique( - Rbac::Permission::MakeHeaderPermission( + sub_and_rules.push_back( + std::make_unique(Rbac::Permission::MakeHeaderPermission( HeaderMatcher::Create(/*name=*/"foo", HeaderMatcher::Type::kExact, /*matcher=*/"bar") .value()))); - sub_and_rules.push_back(absl::make_unique( - Rbac::Permission::MakeHeaderPermission( + sub_and_rules.push_back( + std::make_unique(Rbac::Permission::MakeHeaderPermission( HeaderMatcher::Create(/*name=*/"absent_key", HeaderMatcher::Type::kExact, /*matcher=*/"some_value") .value()))); std::vector> sub_or_rules; - sub_or_rules.push_back(absl::make_unique( + sub_or_rules.push_back(std::make_unique( Rbac::Permission::MakeDestPortPermission(/*port=*/123))); std::vector> and_rules; - and_rules.push_back(absl::make_unique( + and_rules.push_back(std::make_unique( Rbac::Permission::MakeAndPermission(std::move(sub_and_rules)))); - and_rules.push_back(absl::make_unique( + and_rules.push_back(std::make_unique( Rbac::Permission::MakeOrPermission(std::move(std::move(sub_or_rules))))); auto matcher = AuthorizationMatcher::Create(Rbac::Permission( Rbac::Permission::MakeAndPermission(std::move(and_rules)))); @@ -582,8 +582,8 @@ TEST_F(AuthorizationMatchersTest, PolicyAuthorizationMatcherSuccessfulMatch) { args_.AddPairToMetadata("key123", "foo"); EvaluateArgs args = args_.MakeEvaluateArgs(); std::vector> rules; - rules.push_back(absl::make_unique( - Rbac::Permission::MakeHeaderPermission( + rules.push_back( + std::make_unique(Rbac::Permission::MakeHeaderPermission( HeaderMatcher::Create(/*name=*/"key123", HeaderMatcher::Type::kExact, /*matcher=*/"foo") .value()))); @@ -597,8 +597,8 @@ TEST_F(AuthorizationMatchersTest, PolicyAuthorizationMatcherFailedMatch) { args_.AddPairToMetadata("key123", "foo"); EvaluateArgs args = args_.MakeEvaluateArgs(); std::vector> rules; - rules.push_back(absl::make_unique( - Rbac::Permission::MakeHeaderPermission( + rules.push_back( + std::make_unique(Rbac::Permission::MakeHeaderPermission( HeaderMatcher::Create(/*name=*/"key123", HeaderMatcher::Type::kExact, /*matcher=*/"bar") .value()))); diff --git a/test/core/security/channel_creds_registry_test.cc b/test/core/security/channel_creds_registry_test.cc index 17faa2a239d..0f92fbd55eb 100644 --- a/test/core/security/channel_creds_registry_test.cc +++ b/test/core/security/channel_creds_registry_test.cc @@ -85,7 +85,7 @@ TEST_F(ChannelCredsRegistryTest, Register) { [](CoreConfiguration::Builder* builder) { BuildCoreConfiguration(builder); builder->channel_creds_registry()->RegisterChannelCredsFactory( - absl::make_unique()); + std::make_unique()); }); RefCountedPtr test_cred( diff --git a/test/core/security/grpc_authorization_policy_provider_test.cc b/test/core/security/grpc_authorization_policy_provider_test.cc index 88d40c8026e..fa59fc18734 100644 --- a/test/core/security/grpc_authorization_policy_provider_test.cc +++ b/test/core/security/grpc_authorization_policy_provider_test.cc @@ -61,7 +61,7 @@ TEST(AuthorizationPolicyProviderTest, TEST(AuthorizationPolicyProviderTest, FileWatcherInitializationSuccessValidPolicy) { - auto tmp_authz_policy = absl::make_unique( + auto tmp_authz_policy = std::make_unique( testing::GetFileContents(VALID_POLICY_PATH_1)); auto provider = FileWatcherAuthorizationPolicyProvider::Create( tmp_authz_policy->name(), /*refresh_interval_sec=*/1); @@ -81,7 +81,7 @@ TEST(AuthorizationPolicyProviderTest, TEST(AuthorizationPolicyProviderTest, FileWatcherInitializationFailedInvalidPolicy) { - auto tmp_authz_policy = absl::make_unique( + auto tmp_authz_policy = std::make_unique( testing::GetFileContents(INVALID_POLICY_PATH)); auto provider = FileWatcherAuthorizationPolicyProvider::Create( tmp_authz_policy->name(), /*refresh_interval_sec=*/1); @@ -90,7 +90,7 @@ TEST(AuthorizationPolicyProviderTest, } TEST(AuthorizationPolicyProviderTest, FileWatcherSuccessValidPolicyRefresh) { - auto tmp_authz_policy = absl::make_unique( + auto tmp_authz_policy = std::make_unique( testing::GetFileContents(VALID_POLICY_PATH_1)); auto provider = FileWatcherAuthorizationPolicyProvider::Create( tmp_authz_policy->name(), /*refresh_interval_sec=*/1); @@ -140,7 +140,7 @@ TEST(AuthorizationPolicyProviderTest, FileWatcherSuccessValidPolicyRefresh) { TEST(AuthorizationPolicyProviderTest, FileWatcherInvalidPolicyRefreshSkipReload) { - auto tmp_authz_policy = absl::make_unique( + auto tmp_authz_policy = std::make_unique( testing::GetFileContents(VALID_POLICY_PATH_1)); auto provider = FileWatcherAuthorizationPolicyProvider::Create( tmp_authz_policy->name(), /*refresh_interval_sec=*/1); @@ -190,7 +190,7 @@ TEST(AuthorizationPolicyProviderTest, } TEST(AuthorizationPolicyProviderTest, FileWatcherRecoversFromFailure) { - auto tmp_authz_policy = absl::make_unique( + auto tmp_authz_policy = std::make_unique( testing::GetFileContents(VALID_POLICY_PATH_1)); auto provider = FileWatcherAuthorizationPolicyProvider::Create( tmp_authz_policy->name(), /*refresh_interval_sec=*/1); diff --git a/test/core/security/grpc_tls_certificate_distributor_test.cc b/test/core/security/grpc_tls_certificate_distributor_test.cc index 73d5c31fd8e..8e116022841 100644 --- a/test/core/security/grpc_tls_certificate_distributor_test.cc +++ b/test/core/security/grpc_tls_certificate_distributor_test.cc @@ -189,7 +189,7 @@ class GrpcTlsCertificateDistributorTest : public ::testing::Test { // The TlsCertificatesTestWatcher dtor will set WatcherState::watcher back // to nullptr to indicate that it's been destroyed. auto watcher = - absl::make_unique(&watchers_.back()); + std::make_unique(&watchers_.back()); distributor_.WatchTlsCertificates(std::move(watcher), std::move(root_cert_name), std::move(identity_cert_name)); diff --git a/test/core/security/grpc_tls_certificate_provider_test.cc b/test/core/security/grpc_tls_certificate_provider_test.cc index 102b867f34b..94a1fbefe6b 100644 --- a/test/core/security/grpc_tls_certificate_provider_test.cc +++ b/test/core/security/grpc_tls_certificate_provider_test.cc @@ -175,7 +175,7 @@ class GrpcTlsCertificateProviderTest : public ::testing::Test { // The TlsCertificatesTestWatcher dtor will set WatcherState::watcher back // to nullptr to indicate that it's been destroyed. auto watcher = - absl::make_unique(&watchers_.back()); + std::make_unique(&watchers_.back()); distributor_->WatchTlsCertificates(std::move(watcher), std::move(root_cert_name), std::move(identity_cert_name)); @@ -391,9 +391,9 @@ TEST_F(GrpcTlsCertificateProviderTest, TEST_F(GrpcTlsCertificateProviderTest, FileWatcherCertificateProviderWithGoodAtFirstThenDeletedBothCerts) { // Create temporary files and copy cert data into it. - auto tmp_root_cert = absl::make_unique(root_cert_); - auto tmp_identity_key = absl::make_unique(private_key_); - auto tmp_identity_cert = absl::make_unique(cert_chain_); + auto tmp_root_cert = std::make_unique(root_cert_); + auto tmp_identity_key = std::make_unique(private_key_); + auto tmp_identity_cert = std::make_unique(cert_chain_); // Create FileWatcherCertificateProvider. FileWatcherCertificateProvider provider(tmp_identity_key->name(), tmp_identity_cert->name(), @@ -425,7 +425,7 @@ TEST_F(GrpcTlsCertificateProviderTest, TEST_F(GrpcTlsCertificateProviderTest, FileWatcherCertificateProviderWithGoodAtFirstThenDeletedRootCerts) { // Create temporary files and copy cert data into it. - auto tmp_root_cert = absl::make_unique(root_cert_); + auto tmp_root_cert = std::make_unique(root_cert_); TmpFile tmp_identity_key(private_key_); TmpFile tmp_identity_cert(cert_chain_); // Create FileWatcherCertificateProvider. @@ -458,8 +458,8 @@ TEST_F(GrpcTlsCertificateProviderTest, FileWatcherCertificateProviderWithGoodAtFirstThenDeletedIdentityCerts) { // Create temporary files and copy cert data into it. TmpFile tmp_root_cert(root_cert_); - auto tmp_identity_key = absl::make_unique(private_key_); - auto tmp_identity_cert = absl::make_unique(cert_chain_); + auto tmp_identity_key = std::make_unique(private_key_); + auto tmp_identity_cert = std::make_unique(cert_chain_); // Create FileWatcherCertificateProvider. FileWatcherCertificateProvider provider(tmp_identity_key->name(), tmp_identity_cert->name(), diff --git a/test/core/security/grpc_tls_credentials_options_test.cc b/test/core/security/grpc_tls_credentials_options_test.cc index 034b6c12ebe..97c9e94eb2a 100644 --- a/test/core/security/grpc_tls_credentials_options_test.cc +++ b/test/core/security/grpc_tls_credentials_options_test.cc @@ -431,9 +431,9 @@ TEST_F(GrpcTlsCredentialsOptionsTest, TEST_F(GrpcTlsCredentialsOptionsTest, ClientOptionsWithCertWatcherProviderOnDeletedFiles) { // Create temporary files and copy cert data into it. - auto tmp_root_cert = absl::make_unique(root_cert_); - auto tmp_identity_key = absl::make_unique(private_key_); - auto tmp_identity_cert = absl::make_unique(cert_chain_); + auto tmp_root_cert = std::make_unique(root_cert_); + auto tmp_identity_key = std::make_unique(private_key_); + auto tmp_identity_cert = std::make_unique(cert_chain_); // Create ClientOptions using FileWatcherCertificateProvider. auto options = MakeRefCounted(); auto provider = MakeRefCounted( diff --git a/test/core/slice/slice_test.cc b/test/core/slice/slice_test.cc index ab0f8863793..3a51ebdc8a6 100644 --- a/test/core/slice/slice_test.cc +++ b/test/core/slice/slice_test.cc @@ -359,7 +359,7 @@ size_t SumSlice(const Slice& slice) { } TEST(SliceTest, ExternalAsOwned) { - auto external_string = absl::make_unique(RandomString(1024)); + auto external_string = std::make_unique(RandomString(1024)); Slice slice = Slice::FromExternalString(*external_string); const auto initial_sum = SumSlice(slice); Slice owned = slice.AsOwned(); diff --git a/test/core/transport/binder/binder_transport_test.cc b/test/core/transport/binder/binder_transport_test.cc index 2d448887799..c04d4651227 100644 --- a/test/core/transport/binder/binder_transport_test.cc +++ b/test/core/transport/binder/binder_transport_test.cc @@ -54,11 +54,11 @@ class BinderTransportTest : public ::testing::Test { : arena_(grpc_core::Arena::Create(/* initial_size = */ 1, g_memory_allocator)), transport_(grpc_create_binder_transport_client( - absl::make_unique>(), + std::make_unique>(), std::make_shared< grpc::experimental::binder::UntrustedSecurityPolicy>())) { auto* gbt = reinterpret_cast(transport_); - gbt->wire_writer = absl::make_unique(); + gbt->wire_writer = std::make_unique(); GRPC_STREAM_REF_INIT(&ref_, 1, nullptr, nullptr, "phony ref"); } diff --git a/test/core/transport/binder/end2end/binder_server_test.cc b/test/core/transport/binder/end2end/binder_server_test.cc index 08c555b7ff2..edaa4e44449 100644 --- a/test/core/transport/binder/end2end/binder_server_test.cc +++ b/test/core/transport/binder/end2end/binder_server_test.cc @@ -44,7 +44,7 @@ class BinderServerCredentialsImpl final : public ServerCredentials { return grpc_core::AddBinderPort( addr, server, [](grpc_binder::TransactionReceiver::OnTransactCb transact_cb) { - return absl::make_unique< + return std::make_unique< grpc_binder::end2end_testing::FakeTransactionReceiver>( nullptr, std::move(transact_cb)); }, @@ -150,7 +150,7 @@ TEST_F(BinderServerTest, CreateChannelWithEndpointBinder) { void* raw_endpoint_binder = grpc::experimental::binder::GetEndpointBinder("example.service"); std::unique_ptr endpoint_binder = - absl::make_unique( + std::make_unique( static_cast( raw_endpoint_binder)); std::shared_ptr channel = @@ -180,7 +180,7 @@ TEST_F(BinderServerTest, CreateChannelWithEndpointBinderMultipleConnections) { auto thread_fn = [&](size_t id) { std::unique_ptr endpoint_binder = - absl::make_unique( + std::make_unique( static_cast( raw_endpoint_binder)); std::shared_ptr channel = @@ -217,7 +217,7 @@ TEST_F(BinderServerTest, CreateChannelWithEndpointBinderParallelRequests) { void* raw_endpoint_binder = grpc::experimental::binder::GetEndpointBinder("example.service"); std::unique_ptr endpoint_binder = - absl::make_unique( + std::make_unique( static_cast( raw_endpoint_binder)); std::shared_ptr channel = diff --git a/test/core/transport/binder/end2end/end2end_binder_transport_test.cc b/test/core/transport/binder/end2end/end2end_binder_transport_test.cc index 30e5e3f65cf..df3ec4d74ce 100644 --- a/test/core/transport/binder/end2end/end2end_binder_transport_test.cc +++ b/test/core/transport/binder/end2end/end2end_binder_transport_test.cc @@ -41,7 +41,7 @@ class End2EndBinderTransportTest End2EndBinderTransportTest() { end2end_testing::g_transaction_processor = new end2end_testing::TransactionProcessor(GetParam()); - service_ = absl::make_unique(); + service_ = std::make_unique(); grpc::ServerBuilder builder; builder.RegisterService(service_.get()); server_ = builder.BuildAndStart(); diff --git a/test/core/transport/binder/end2end/fake_binder.cc b/test/core/transport/binder/end2end/fake_binder.cc index 0be3098536b..704179838ca 100644 --- a/test/core/transport/binder/end2end/fake_binder.cc +++ b/test/core/transport/binder/end2end/fake_binder.cc @@ -84,7 +84,7 @@ absl::Status FakeReadableParcel::ReadBinder(std::unique_ptr* data) { } void* endpoint = absl::get(data_[data_position_++]); if (!endpoint) return absl::InternalError("ReadBinder failed"); - *data = absl::make_unique(static_cast(endpoint)); + *data = std::make_unique(static_cast(endpoint)); return absl::OkStatus(); } @@ -122,13 +122,13 @@ FakeTransactionReceiver::FakeTransactionReceiver( TransactionReceiver::OnTransactCb transact_cb) { persistent_tx_receiver_ = &g_transaction_processor->NewPersistentTxReceiver( std::move(wire_reader_ref), std::move(transact_cb), - absl::make_unique()); + std::make_unique()); } std::unique_ptr FakeBinder::ConstructTxReceiver( grpc_core::RefCountedPtr wire_reader_ref, TransactionReceiver::OnTransactCb cb) const { - return absl::make_unique(wire_reader_ref, cb); + return std::make_unique(wire_reader_ref, cb); } void* FakeTransactionReceiver::GetRawBinder() { @@ -136,7 +136,7 @@ void* FakeTransactionReceiver::GetRawBinder() { } std::unique_ptr FakeTransactionReceiver::GetSender() const { - return absl::make_unique( + return std::make_unique( persistent_tx_receiver_->tunnel_->GetSendEndpoint()); } @@ -208,7 +208,7 @@ void TransactionProcessor::Flush() { mu_.Unlock(); auto* tx_receiver = static_cast(target->owner); - auto parcel = absl::make_unique(std::move(data)); + auto parcel = std::make_unique(std::move(data)); tx_receiver->Receive(tx_code, parcel.get()).IgnoreError(); } } @@ -232,7 +232,7 @@ void TransactionProcessor::ProcessLoop() { mu_.Unlock(); auto* tx_receiver = static_cast(target->owner); - auto parcel = absl::make_unique(std::move(data)); + auto parcel = std::make_unique(std::move(data)); tx_receiver->Receive(tx_code, parcel.get()).IgnoreError(); grpc_core::ExecCtx::Get()->Flush(); } @@ -257,15 +257,15 @@ void TransactionProcessor::EnQueueTransaction(FakeEndpoint* target, } FakeBinderTunnel::FakeBinderTunnel() - : send_endpoint_(absl::make_unique(this)), - recv_endpoint_(absl::make_unique(this)) { + : send_endpoint_(std::make_unique(this)), + recv_endpoint_(std::make_unique(this)) { send_endpoint_->other_end = recv_endpoint_.get(); recv_endpoint_->other_end = send_endpoint_.get(); } std::pair, std::unique_ptr> NewBinderPair(TransactionReceiver::OnTransactCb transact_cb) { - auto tx_receiver = absl::make_unique( + auto tx_receiver = std::make_unique( nullptr, std::move(transact_cb)); std::unique_ptr sender = tx_receiver->GetSender(); return std::make_pair(std::move(sender), std::move(tx_receiver)); diff --git a/test/core/transport/binder/end2end/fake_binder.h b/test/core/transport/binder/end2end/fake_binder.h index 09efcf82b0f..a50359e0f2f 100644 --- a/test/core/transport/binder/end2end/fake_binder.h +++ b/test/core/transport/binder/end2end/fake_binder.h @@ -204,7 +204,7 @@ class FakeBinder final : public Binder { void Initialize() override {} absl::Status PrepareTransaction() override { - input_ = absl::make_unique(); + input_ = std::make_unique(); return absl::OkStatus(); } diff --git a/test/core/transport/binder/end2end/fake_binder_test.cc b/test/core/transport/binder/end2end/fake_binder_test.cc index b9e819da344..c08d05d0c91 100644 --- a/test/core/transport/binder/end2end/fake_binder_test.cc +++ b/test/core/transport/binder/end2end/fake_binder_test.cc @@ -178,7 +178,7 @@ TEST_P(FakeBinderTest, SendBinder) { int called2 = 0; std::unique_ptr tx_receiver2 = - absl::make_unique( + std::make_unique( nullptr, [&](transaction_code_t tx_code, ReadableParcel* parcel, int /*uid*/) { int value; diff --git a/test/core/transport/binder/end2end/fuzzers/client_fuzzer.cc b/test/core/transport/binder/end2end/fuzzers/client_fuzzer.cc index 9eb262afa9d..2458e74a293 100644 --- a/test/core/transport/binder/end2end/fuzzers/client_fuzzer.cc +++ b/test/core/transport/binder/end2end/fuzzers/client_fuzzer.cc @@ -46,7 +46,7 @@ DEFINE_PROTO_FUZZER(const binder_transport_fuzzer::Input& input) { grpc_completion_queue* cq = grpc_completion_queue_create_for_next(nullptr); grpc_transport* client_transport = grpc_create_binder_transport_client( - absl::make_unique( + std::make_unique( input.incoming_parcels()), std::make_shared< grpc::experimental::binder::UntrustedSecurityPolicy>()); diff --git a/test/core/transport/binder/end2end/fuzzers/fuzzer_utils.cc b/test/core/transport/binder/end2end/fuzzers/fuzzer_utils.cc index d3e25f2d151..7575a0e56ba 100644 --- a/test/core/transport/binder/end2end/fuzzers/fuzzer_utils.cc +++ b/test/core/transport/binder/end2end/fuzzers/fuzzer_utils.cc @@ -75,7 +75,7 @@ absl::Status ReadableParcelForFuzzing::ReadBinder( if (values_.empty() || !values_.front().has_binder()) { return absl::InternalError("error"); } - *binder = absl::make_unique(); + *binder = std::make_unique(); values_.pop(); consumed_data_size_ += sizeof(void*); return absl::OkStatus(); @@ -114,7 +114,7 @@ void FuzzingLoop( { // Send SETUP_TRANSPORT request. std::unique_ptr parcel = - absl::make_unique( + std::make_unique( incoming_parcels.setup_transport_transaction().parcel()); callback(static_cast( grpc_binder::BinderTransportTxCode::SETUP_TRANSPORT), @@ -125,7 +125,7 @@ void FuzzingLoop( for (const auto& tx_iter : incoming_parcels.transactions()) { transaction_code_t tx_code = tx_iter.code(); std::unique_ptr parcel = - absl::make_unique(tx_iter.parcel()); + std::make_unique(tx_iter.parcel()); callback(tx_code, parcel.get(), /*uid=*/tx_iter.uid()) .IgnoreError(); @@ -145,7 +145,7 @@ TransactionReceiverForFuzzing::TransactionReceiverForFuzzing( std::unique_ptr BinderForFuzzing::ConstructTxReceiver( grpc_core::RefCountedPtr wire_reader_ref, TransactionReceiver::OnTransactCb cb) const { - auto tx_receiver = absl::make_unique( + auto tx_receiver = std::make_unique( incoming_parcels_, wire_reader_ref, cb); return tx_receiver; } diff --git a/test/core/transport/binder/end2end/fuzzers/fuzzer_utils.h b/test/core/transport/binder/end2end/fuzzers/fuzzer_utils.h index 7821bf85188..ce0c988ecca 100644 --- a/test/core/transport/binder/end2end/fuzzers/fuzzer_utils.h +++ b/test/core/transport/binder/end2end/fuzzers/fuzzer_utils.h @@ -62,10 +62,10 @@ class NoOpWritableParcel : public WritableParcel { // returns a TransactionReceiverForFuzzing. class BinderForFuzzing : public Binder { public: - BinderForFuzzing() : input_(absl::make_unique()) {} + BinderForFuzzing() : input_(std::make_unique()) {} explicit BinderForFuzzing(const binder_transport_fuzzer::IncomingParcels& p) - : incoming_parcels_(p), input_(absl::make_unique()) {} + : incoming_parcels_(p), input_(std::make_unique()) {} void Initialize() override {} absl::Status PrepareTransaction() override { return absl::OkStatus(); } diff --git a/test/core/transport/binder/end2end/fuzzers/server_fuzzer.cc b/test/core/transport/binder/end2end/fuzzers/server_fuzzer.cc index 44d8aa168f1..11338031011 100644 --- a/test/core/transport/binder/end2end/fuzzers/server_fuzzer.cc +++ b/test/core/transport/binder/end2end/fuzzers/server_fuzzer.cc @@ -46,7 +46,7 @@ DEFINE_PROTO_FUZZER(const binder_transport_fuzzer::Input& input) { grpc_server_register_method(server, "/reg", nullptr, {}, 0); grpc_server_start(server); grpc_transport* server_transport = grpc_create_binder_transport_server( - absl::make_unique( + std::make_unique( input.incoming_parcels()), std::make_shared< grpc::experimental::binder::UntrustedSecurityPolicy>()); diff --git a/test/core/transport/binder/end2end/testing_channel_create.cc b/test/core/transport/binder/end2end/testing_channel_create.cc index 868e92b6631..d74d5fd44f5 100644 --- a/test/core/transport/binder/end2end/testing_channel_create.cc +++ b/test/core/transport/binder/end2end/testing_channel_create.cc @@ -35,7 +35,7 @@ namespace { class ServerSetupTransportHelper { public: ServerSetupTransportHelper() - : wire_reader_(absl::make_unique( + : wire_reader_(std::make_unique( /*transport_stream_receiver=*/nullptr, /*is_client=*/false, std::make_shared< grpc::experimental::binder::UntrustedSecurityPolicy>())) { diff --git a/test/core/transport/binder/endpoint_binder_pool_test.cc b/test/core/transport/binder/endpoint_binder_pool_test.cc index aebaf844bef..bb23216f03d 100644 --- a/test/core/transport/binder/endpoint_binder_pool_test.cc +++ b/test/core/transport/binder/endpoint_binder_pool_test.cc @@ -37,7 +37,7 @@ class CallbackChecker { TEST(EndpointBinderPoolTest, AddBeforeGet) { EndpointBinderPool pool; - auto b = absl::make_unique(); + auto b = std::make_unique(); CallbackChecker cc; pool.AddEndpointBinder("test", std::move(b)); // TODO(mingcl): Use pointer matcher to verify it is `b` being passed back @@ -49,7 +49,7 @@ TEST(EndpointBinderPoolTest, AddBeforeGet) { TEST(EndpointBinderPoolTest, GetBeforeAdd) { EndpointBinderPool pool; - auto b = absl::make_unique(); + auto b = std::make_unique(); CallbackChecker cc; EXPECT_CALL(cc, Cb(testing::_)).Times(0); pool.GetEndpointBinder( @@ -60,7 +60,7 @@ TEST(EndpointBinderPoolTest, GetBeforeAdd) { TEST(EndpointBinderPoolTest, ExpectNotCalled) { EndpointBinderPool pool; - auto b = absl::make_unique(); + auto b = std::make_unique(); CallbackChecker cc; EXPECT_CALL(cc, Cb(testing::_)).Times(0); pool.GetEndpointBinder( diff --git a/test/core/transport/binder/mock_objects.cc b/test/core/transport/binder/mock_objects.cc index 4fb03555f4e..7e173ef15ad 100644 --- a/test/core/transport/binder/mock_objects.cc +++ b/test/core/transport/binder/mock_objects.cc @@ -24,7 +24,7 @@ using ::testing::Return; MockReadableParcel::MockReadableParcel() { ON_CALL(*this, ReadBinder).WillByDefault([](std::unique_ptr* binder) { - *binder = absl::make_unique(); + *binder = std::make_unique(); return absl::OkStatus(); }); ON_CALL(*this, ReadInt32).WillByDefault(Return(absl::OkStatus())); @@ -47,7 +47,7 @@ MockBinder::MockBinder() { .WillByDefault( [this](grpc_core::RefCountedPtr /*wire_reader_ref*/, TransactionReceiver::OnTransactCb cb) { - return absl::make_unique( + return std::make_unique( cb, BinderTransportTxCode::SETUP_TRANSPORT, &mock_output_); }); } diff --git a/test/core/transport/binder/transport_stream_receiver_test.cc b/test/core/transport/binder/transport_stream_receiver_test.cc index 57b8ef10ad9..acedb0c60bd 100644 --- a/test/core/transport/binder/transport_stream_receiver_test.cc +++ b/test/core/transport/binder/transport_stream_receiver_test.cc @@ -114,14 +114,14 @@ class MockOpBatch { : id_(id), flag_(flag), seq_num_(seq_num) { if (flag_ & kFlagPrefix) { initial_metadata_callback_ = - absl::make_unique(id_, seq_num_); + std::make_unique(id_, seq_num_); } if (flag_ & kFlagMessageData) { - message_callback_ = absl::make_unique(id_, seq_num_); + message_callback_ = std::make_unique(id_, seq_num_); } if (flag_ & kFlagSuffix) { trailing_metadata_callback_ = - absl::make_unique(id_, seq_num_); + std::make_unique(id_, seq_num_); } } diff --git a/test/core/transport/binder/wire_reader_test.cc b/test/core/transport/binder/wire_reader_test.cc index 876329e6398..0ff3621c099 100644 --- a/test/core/transport/binder/wire_reader_test.cc +++ b/test/core/transport/binder/wire_reader_test.cc @@ -84,7 +84,7 @@ class WireReaderTest : public ::testing::Test { // requests and streaming calls. The MockBinder will construct a // MockTransactionReceiver, which will then sends SETUP_TRANSPORT request // back to us. - wire_reader_->SetupTransport(absl::make_unique()); + wire_reader_->SetupTransport(std::make_unique()); } template @@ -113,7 +113,7 @@ MATCHER_P(StatusOrContainerEq, target, "") { } // namespace TEST_F(WireReaderTest, SetupTransport) { - auto mock_binder = absl::make_unique(); + auto mock_binder = std::make_unique(); MockBinder& mock_binder_ref = *mock_binder; ::testing::InSequence sequence; diff --git a/test/core/transport/binder/wire_writer_test.cc b/test/core/transport/binder/wire_writer_test.cc index b117e1eb275..8eb34912567 100644 --- a/test/core/transport/binder/wire_writer_test.cc +++ b/test/core/transport/binder/wire_writer_test.cc @@ -40,7 +40,7 @@ TEST(WireWriterTest, RpcCall) { init_lib.init(); // Required because wire writer uses combiner internally. grpc_core::ExecCtx exec_ctx; - auto mock_binder = absl::make_unique(); + auto mock_binder = std::make_unique(); MockBinder& mock_binder_ref = *mock_binder; MockWritableParcel mock_writable_parcel; ON_CALL(mock_binder_ref, GetWritableParcel) diff --git a/test/core/transport/chttp2/flow_control_fuzzer.cc b/test/core/transport/chttp2/flow_control_fuzzer.cc index ea5bcfd7695..5a587678b90 100644 --- a/test/core/transport/chttp2/flow_control_fuzzer.cc +++ b/test/core/transport/chttp2/flow_control_fuzzer.cc @@ -29,7 +29,6 @@ #include #include "absl/base/attributes.h" -#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/types/optional.h" @@ -77,8 +76,8 @@ class FlowControlFuzzer { public: explicit FlowControlFuzzer(bool enable_bdp) { ExecCtx exec_ctx; - tfc_ = absl::make_unique("fuzzer", enable_bdp, - &memory_owner_); + tfc_ = std::make_unique("fuzzer", enable_bdp, + &memory_owner_); } ~FlowControlFuzzer() { diff --git a/test/core/transport/chttp2/graceful_shutdown_test.cc b/test/core/transport/chttp2/graceful_shutdown_test.cc index 410761d4c5d..4dfd310f46f 100644 --- a/test/core/transport/chttp2/graceful_shutdown_test.cc +++ b/test/core/transport/chttp2/graceful_shutdown_test.cc @@ -29,7 +29,6 @@ #include #include "absl/base/thread_annotations.h" -#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/strings/match.h" #include "absl/strings/str_cat.h" @@ -79,7 +78,7 @@ class GracefulShutdownTest : public ::testing::Test { void SetupAndStart() { ExecCtx exec_ctx; cq_ = grpc_completion_queue_create_for_next(nullptr); - cqv_ = absl::make_unique(cq_); + cqv_ = std::make_unique(cq_); grpc_arg server_args[] = { grpc_channel_arg_integer_create( const_cast(GRPC_ARG_HTTP2_BDP_PROBE), 0), @@ -102,7 +101,7 @@ class GracefulShutdownTest : public ::testing::Test { grpc_chttp2_transport_start_reading(transport, nullptr, nullptr, nullptr); // Start polling on the client Notification client_poller_thread_started_notification; - client_poll_thread_ = absl::make_unique( + client_poll_thread_ = std::make_unique( [this, &client_poller_thread_started_notification]() { grpc_completion_queue* client_cq = grpc_completion_queue_create_for_next(nullptr); diff --git a/test/core/transport/chttp2/hpack_parser_test.cc b/test/core/transport/chttp2/hpack_parser_test.cc index d2843df0115..5ddc34c7bdb 100644 --- a/test/core/transport/chttp2/hpack_parser_test.cc +++ b/test/core/transport/chttp2/hpack_parser_test.cc @@ -23,7 +23,6 @@ #include #include -#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/strings/str_cat.h" #include "absl/types/optional.h" @@ -63,7 +62,7 @@ class ParseTest : public ::testing::TestWithParam { public: ParseTest() { grpc_init(); - parser_ = absl::make_unique(); + parser_ = std::make_unique(); } ~ParseTest() override { diff --git a/test/core/transport/chttp2/remove_stream_from_stalled_lists_test.cc b/test/core/transport/chttp2/remove_stream_from_stalled_lists_test.cc index ee2ed123681..27cfc726690 100644 --- a/test/core/transport/chttp2/remove_stream_from_stalled_lists_test.cc +++ b/test/core/transport/chttp2/remove_stream_from_stalled_lists_test.cc @@ -29,8 +29,6 @@ #include -#include "absl/memory/memory.h" - #include #include #include @@ -293,7 +291,7 @@ TEST(Pollers, TestDontCrashWhenTryingToReproIssueFixedBy23984) { const int kNumCalls = 64; std::vector threads; threads.reserve(kNumCalls); - std::unique_ptr test_server = absl::make_unique(); + std::unique_ptr test_server = std::make_unique(); const std::string server_address = test_server->address(); for (int i = 0; i < kNumCalls; i++) { threads.push_back(std::thread([server_address]() { diff --git a/test/core/transport/chttp2/settings_timeout_test.cc b/test/core/transport/chttp2/settings_timeout_test.cc index 964f3fb5610..141280e0f3c 100644 --- a/test/core/transport/chttp2/settings_timeout_test.cc +++ b/test/core/transport/chttp2/settings_timeout_test.cc @@ -24,7 +24,6 @@ #include #include -#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" @@ -87,7 +86,7 @@ class ServerThread { grpc_server_register_completion_queue(server_, cq_, nullptr); grpc_server_start(server_); thread_ = - absl::make_unique(std::bind(&ServerThread::Serve, this)); + std::make_unique(std::bind(&ServerThread::Serve, this)); grpc_resource_quota_unref( static_cast(a[1].value.pointer.p)); } diff --git a/test/core/transport/chttp2/streams_not_seen_test.cc b/test/core/transport/chttp2/streams_not_seen_test.cc index e40220c65bb..b2c6e5dceae 100644 --- a/test/core/transport/chttp2/streams_not_seen_test.cc +++ b/test/core/transport/chttp2/streams_not_seen_test.cc @@ -32,7 +32,6 @@ #include #include "absl/base/thread_annotations.h" -#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/strings/match.h" #include "absl/strings/str_cat.h" @@ -231,14 +230,14 @@ class StreamsNotSeenTest : public ::testing::Test { test_tcp_server_init(&server_, OnConnect, this); test_tcp_server_start(&server_, port_); // Start polling on the test tcp server - server_poll_thread_ = absl::make_unique([this]() { + server_poll_thread_ = std::make_unique([this]() { while (!shutdown_) { test_tcp_server_poll(&server_, 10); } }); // Create the channel cq_ = grpc_completion_queue_create_for_next(nullptr); - cqv_ = absl::make_unique(cq_); + cqv_ = std::make_unique(cq_); grpc_arg client_args[] = { grpc_channel_arg_integer_create( const_cast(GRPC_ARG_HTTP2_MAX_PINGS_WITHOUT_DATA), 0), diff --git a/test/core/transport/parsed_metadata_test.cc b/test/core/transport/parsed_metadata_test.cc index c9f74a32bf4..387226b0c30 100644 --- a/test/core/transport/parsed_metadata_test.cc +++ b/test/core/transport/parsed_metadata_test.cc @@ -18,7 +18,6 @@ #include -#include "absl/memory/memory.h" #include "absl/strings/numbers.h" #include "gmock/gmock.h" #include "gtest/gtest.h" @@ -209,8 +208,8 @@ INSTANTIATE_TYPED_TEST_SUITE_P(My, TraitSpecializedTest, InterestingTraits); TEST(KeyValueTest, Simple) { using PM = ParsedMetadata; using PMPtr = std::unique_ptr; - PMPtr p = absl::make_unique(Slice::FromCopiedString("key"), - Slice::FromCopiedString("value")); + PMPtr p = std::make_unique(Slice::FromCopiedString("key"), + Slice::FromCopiedString("value")); EXPECT_EQ(p->DebugString(), "key: value"); EXPECT_EQ(p->transport_size(), 40); PM p2 = p->WithNewValue(Slice::FromCopiedString("some_other_value"), @@ -233,8 +232,8 @@ TEST(KeyValueTest, Simple) { TEST(KeyValueTest, LongKey) { using PM = ParsedMetadata; using PMPtr = std::unique_ptr; - PMPtr p = absl::make_unique(Slice::FromCopiedString(std::string(60, 'a')), - Slice::FromCopiedString("value")); + PMPtr p = std::make_unique(Slice::FromCopiedString(std::string(60, 'a')), + Slice::FromCopiedString("value")); EXPECT_EQ( p->DebugString(), "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa: value"); diff --git a/test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc b/test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc index ce352c9ae6b..b4e1920b579 100644 --- a/test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc +++ b/test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc @@ -158,7 +158,7 @@ class TestServer { grpc_server_start(server_); gpr_log(GPR_DEBUG, "Start TestServer %p. listen on %s", this, server_addr_.c_str()); - server_thd_ = absl::make_unique(PollUntilShutdown, this); + server_thd_ = std::make_unique(PollUntilShutdown, this); } ~TestServer() { @@ -211,7 +211,7 @@ class ConnectLoopRunner { loops_(loops), expected_connectivity_states_(expected_connectivity_states), reconnect_backoff_ms_(reconnect_backoff_ms) { - thd_ = absl::make_unique(ConnectLoop, this); + thd_ = std::make_unique(ConnectLoop, this); } ~ConnectLoopRunner() { thd_->join(); } @@ -310,7 +310,7 @@ TEST(AltsConcurrentConnectivityTest, TestConcurrentClientServerHandshakes) { gpr_log(GPR_DEBUG, "start performing concurrent expected-to-succeed connects"); for (size_t i = 0; i < num_concurrent_connects; i++) { - connect_loop_runners.push_back(absl::make_unique( + connect_loop_runners.push_back(std::make_unique( test_server.address(), fake_handshake_server.address(), 15 /* per connect deadline seconds */, 5 /* loops */, GRPC_CHANNEL_READY /* expected connectivity states */, @@ -355,7 +355,7 @@ TEST(AltsConcurrentConnectivityTest, size_t num_concurrent_connects = 100; gpr_log(GPR_DEBUG, "start performing concurrent expected-to-fail connects"); for (size_t i = 0; i < num_concurrent_connects; i++) { - connect_loop_runners.push_back(absl::make_unique( + connect_loop_runners.push_back(std::make_unique( fake_backend_server.address(), fake_handshake_server.address(), 10 /* per connect deadline seconds */, 3 /* loops */, GRPC_CHANNEL_TRANSIENT_FAILURE /* expected connectivity states */, @@ -394,7 +394,7 @@ TEST(AltsConcurrentConnectivityTest, size_t num_concurrent_connects = 100; gpr_log(GPR_DEBUG, "start performing concurrent expected-to-fail connects"); for (size_t i = 0; i < num_concurrent_connects; i++) { - connect_loop_runners.push_back(absl::make_unique( + connect_loop_runners.push_back(std::make_unique( fake_backend_server.address(), fake_handshake_server.address(), 20 /* per connect deadline seconds */, 2 /* loops */, GRPC_CHANNEL_TRANSIENT_FAILURE /* expected connectivity states */, @@ -433,7 +433,7 @@ TEST(AltsConcurrentConnectivityTest, size_t num_concurrent_connects = 100; gpr_log(GPR_DEBUG, "start performing concurrent expected-to-fail connects"); for (size_t i = 0; i < num_concurrent_connects; i++) { - connect_loop_runners.push_back(absl::make_unique( + connect_loop_runners.push_back(std::make_unique( fake_backend_server.address(), fake_handshake_server.address(), 10 /* per connect deadline seconds */, 2 /* loops */, GRPC_CHANNEL_TRANSIENT_FAILURE /* expected connectivity states */, diff --git a/test/core/util/BUILD b/test/core/util/BUILD index 6b3d3be65f6..556bcceebe1 100644 --- a/test/core/util/BUILD +++ b/test/core/util/BUILD @@ -283,7 +283,6 @@ grpc_cc_library( srcs = ["test_lb_policies.cc"], hdrs = ["test_lb_policies.h"], external_deps = [ - "absl/memory", "absl/status", "absl/status:statusor", "absl/strings", @@ -316,7 +315,6 @@ grpc_cc_library( srcs = ["fake_udp_and_tcp_server.cc"], hdrs = ["fake_udp_and_tcp_server.h"], external_deps = [ - "absl/memory", "absl/status:statusor", "absl/strings", ], diff --git a/test/core/util/fake_udp_and_tcp_server.cc b/test/core/util/fake_udp_and_tcp_server.cc index 0ab8b2f9350..829f80d5cad 100644 --- a/test/core/util/fake_udp_and_tcp_server.cc +++ b/test/core/util/fake_udp_and_tcp_server.cc @@ -25,7 +25,6 @@ #include #include -#include "absl/memory/memory.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" @@ -154,7 +153,7 @@ FakeUdpAndTcpServer::FakeUdpAndTcpServer( GPR_ASSERT(0); } gpr_event_init(&stop_ev_); - run_server_loop_thd_ = absl::make_unique( + run_server_loop_thd_ = std::make_unique( std::bind(&FakeUdpAndTcpServer::RunServerLoop, this)); } @@ -271,7 +270,7 @@ void FakeUdpAndTcpServer::RunServerLoop() { GPR_ASSERT(0); } #endif - peers.insert(absl::make_unique(p)); + peers.insert(std::make_unique(p)); } auto it = peers.begin(); while (it != peers.end()) { diff --git a/test/core/util/test_lb_policies.cc b/test/core/util/test_lb_policies.cc index 176ae8a2a91..0aeea429ebb 100644 --- a/test/core/util/test_lb_policies.cc +++ b/test/core/util/test_lb_policies.cc @@ -22,7 +22,6 @@ #include #include -#include "absl/memory/memory.h" #include "absl/status/statusor.h" #include "absl/strings/string_view.h" #include "absl/types/variant.h" @@ -101,7 +100,7 @@ class TestPickArgsLb : public ForwardingLoadBalancingPolicy { TestPickArgsLb(Args args, TestPickArgsCallback cb, absl::string_view delegate_policy_name) : ForwardingLoadBalancingPolicy( - absl::make_unique(RefCountedPtr(this), cb), + std::make_unique(RefCountedPtr(this), cb), std::move(args), delegate_policy_name, /*initial_refcount=*/2) {} @@ -145,7 +144,7 @@ class TestPickArgsLb : public ForwardingLoadBalancingPolicy { void UpdateState(grpc_connectivity_state state, const absl::Status& status, std::unique_ptr picker) override { parent_->channel_control_helper()->UpdateState( - state, status, absl::make_unique(std::move(picker), cb_)); + state, status, std::make_unique(std::move(picker), cb_)); } void RequestReresolution() override { @@ -209,7 +208,7 @@ class InterceptRecvTrailingMetadataLoadBalancingPolicy InterceptRecvTrailingMetadataLoadBalancingPolicy( Args args, InterceptRecvTrailingMetadataCallback cb) : ForwardingLoadBalancingPolicy( - absl::make_unique( + std::make_unique( RefCountedPtr( this), std::move(cb)), @@ -237,7 +236,7 @@ class InterceptRecvTrailingMetadataLoadBalancingPolicy auto* complete_pick = absl::get_if(&result.result); if (complete_pick != nullptr) { complete_pick->subchannel_call_tracker = - absl::make_unique(cb_); + std::make_unique(cb_); } return result; } @@ -263,7 +262,7 @@ class InterceptRecvTrailingMetadataLoadBalancingPolicy void UpdateState(grpc_connectivity_state state, const absl::Status& status, std::unique_ptr picker) override { parent_->channel_control_helper()->UpdateState( - state, status, absl::make_unique(std::move(picker), cb_)); + state, status, std::make_unique(std::move(picker), cb_)); } void RequestReresolution() override { @@ -346,7 +345,7 @@ class AddressTestLoadBalancingPolicy : public ForwardingLoadBalancingPolicy { public: AddressTestLoadBalancingPolicy(Args args, AddressTestCallback cb) : ForwardingLoadBalancingPolicy( - absl::make_unique( + std::make_unique( RefCountedPtr(this), std::move(cb)), std::move(args), @@ -444,7 +443,7 @@ class FixedAddressLoadBalancingPolicy : public ForwardingLoadBalancingPolicy { public: explicit FixedAddressLoadBalancingPolicy(Args args) : ForwardingLoadBalancingPolicy( - absl::make_unique( + std::make_unique( RefCountedPtr(this)), std::move(args), /*delegate_policy_name=*/"pick_first", @@ -557,7 +556,7 @@ class OobBackendMetricTestLoadBalancingPolicy OobBackendMetricTestLoadBalancingPolicy(Args args, OobBackendMetricCallback cb) : ForwardingLoadBalancingPolicy( - absl::make_unique( + std::make_unique( RefCountedPtr(this)), std::move(args), /*delegate_policy_name=*/"pick_first", @@ -599,8 +598,8 @@ class OobBackendMetricTestLoadBalancingPolicy auto subchannel = parent_->channel_control_helper()->CreateSubchannel(address, args); subchannel->AddDataWatcher(MakeOobBackendMetricWatcher( - Duration::Seconds(1), absl::make_unique( - std::move(address), parent_))); + Duration::Seconds(1), + std::make_unique(std::move(address), parent_))); return subchannel; } @@ -673,7 +672,7 @@ class FailPolicy : public LoadBalancingPolicy { absl::Status UpdateLocked(UpdateArgs) override { channel_control_helper()->UpdateState( GRPC_CHANNEL_TRANSIENT_FAILURE, status_, - absl::make_unique(status_, pick_counter_)); + std::make_unique(status_, pick_counter_)); return absl::OkStatus(); } @@ -733,40 +732,40 @@ void RegisterTestPickArgsLoadBalancingPolicy( CoreConfiguration::Builder* builder, TestPickArgsCallback cb, absl::string_view delegate_policy_name) { builder->lb_policy_registry()->RegisterLoadBalancingPolicyFactory( - absl::make_unique(std::move(cb), - delegate_policy_name)); + std::make_unique(std::move(cb), + delegate_policy_name)); } void RegisterInterceptRecvTrailingMetadataLoadBalancingPolicy( CoreConfiguration::Builder* builder, InterceptRecvTrailingMetadataCallback cb) { builder->lb_policy_registry()->RegisterLoadBalancingPolicyFactory( - absl::make_unique(std::move(cb))); + std::make_unique(std::move(cb))); } void RegisterAddressTestLoadBalancingPolicy(CoreConfiguration::Builder* builder, AddressTestCallback cb) { builder->lb_policy_registry()->RegisterLoadBalancingPolicyFactory( - absl::make_unique(std::move(cb))); + std::make_unique(std::move(cb))); } void RegisterFixedAddressLoadBalancingPolicy( CoreConfiguration::Builder* builder) { builder->lb_policy_registry()->RegisterLoadBalancingPolicyFactory( - absl::make_unique()); + std::make_unique()); } void RegisterOobBackendMetricTestLoadBalancingPolicy( CoreConfiguration::Builder* builder, OobBackendMetricCallback cb) { builder->lb_policy_registry()->RegisterLoadBalancingPolicyFactory( - absl::make_unique(std::move(cb))); + std::make_unique(std::move(cb))); } void RegisterFailLoadBalancingPolicy(CoreConfiguration::Builder* builder, absl::Status status, std::atomic* pick_counter) { builder->lb_policy_registry()->RegisterLoadBalancingPolicyFactory( - absl::make_unique(std::move(status), pick_counter)); + std::make_unique(std::move(status), pick_counter)); } } // namespace grpc_core diff --git a/test/core/xds/certificate_provider_store_test.cc b/test/core/xds/certificate_provider_store_test.cc index 1f1f4bb4db6..228daf84144 100644 --- a/test/core/xds/certificate_provider_store_test.cc +++ b/test/core/xds/certificate_provider_store_test.cc @@ -116,7 +116,7 @@ TEST_F(CertificateProviderStoreTest, Basic) { }, [=] { auto fake_factory_2 = - absl::make_unique(); + std::make_unique(); // Set up store CertificateProviderStore::PluginDefinitionMap map = { {"fake_plugin_1", diff --git a/test/core/xds/xds_bootstrap_test.cc b/test/core/xds/xds_bootstrap_test.cc index 9762fd857bc..575fd59c7ca 100644 --- a/test/core/xds/xds_bootstrap_test.cc +++ b/test/core/xds/xds_bootstrap_test.cc @@ -716,7 +716,7 @@ int main(int argc, char** argv) { [](grpc_core::CoreConfiguration::Builder* builder) { builder->certificate_provider_registry() ->RegisterCertificateProviderFactory( - absl::make_unique< + std::make_unique< grpc_core::testing::FakeCertificateProviderFactory>()); }); grpc_init(); diff --git a/test/core/xds/xds_client_test.cc b/test/core/xds/xds_client_test.cc index f1c2a7de5a8..176044e3a8b 100644 --- a/test/core/xds/xds_client_test.cc +++ b/test/core/xds/xds_client_test.cc @@ -149,7 +149,7 @@ class XdsClientTest : public ::testing::Test { return *this; } std::unique_ptr Build() { - auto bootstrap = absl::make_unique(); + auto bootstrap = std::make_unique(); bootstrap->server_ = std::move(server_); bootstrap->node_ = std::move(node_); bootstrap->authorities_ = std::move(authorities_); @@ -336,7 +336,7 @@ class XdsClientTest : public ::testing::Test { result.resource = foo.status(); } else { result.name = foo->name; - auto resource = absl::make_unique, ResourceStruct>::ResourceDataSubclass>(); resource->resource = std::move(*foo); diff --git a/test/core/xds/xds_lb_policy_registry_test.cc b/test/core/xds/xds_lb_policy_registry_test.cc index 23c98b04f5b..dee1b6dca26 100644 --- a/test/core/xds/xds_lb_policy_registry_test.cc +++ b/test/core/xds/xds_lb_policy_registry_test.cc @@ -514,7 +514,7 @@ int main(int argc, char** argv) { grpc_core::CoreConfiguration::RegisterBuilder( [](grpc_core::CoreConfiguration::Builder* builder) { builder->lb_policy_registry()->RegisterLoadBalancingPolicyFactory( - absl::make_unique()); + std::make_unique()); }); grpc_init(); diff --git a/test/cpp/client/client_channel_stress_test.cc b/test/cpp/client/client_channel_stress_test.cc index 8edd0b82ed9..36461f56282 100644 --- a/test/cpp/client/client_channel_stress_test.cc +++ b/test/cpp/client/client_channel_stress_test.cc @@ -180,7 +180,7 @@ class ClientChannelStressTest { port_ = grpc_pick_unused_port_or_die(); gpr_log(GPR_INFO, "starting %s server on port %d", type_.c_str(), port_); grpc::internal::CondVar cond; - thread_ = absl::make_unique( + thread_ = std::make_unique( std::bind(&ServerThread::Start, this, server_host, &mu, &cond)); cond.Wait(&mu); gpr_log(GPR_INFO, "%s server startup complete", type_.c_str()); diff --git a/test/cpp/end2end/async_end2end_test.cc b/test/cpp/end2end/async_end2end_test.cc index 3b2e47e7651..345a34c7559 100644 --- a/test/cpp/end2end/async_end2end_test.cc +++ b/test/cpp/end2end/async_end2end_test.cc @@ -289,8 +289,7 @@ class AsyncEnd2endTest : public ::testing::TestWithParam { auto server_creds = GetCredentialsProvider()->GetServerCredentials( GetParam().credentials_type); builder.AddListeningPort(server_address_.str(), server_creds); - service_ = - absl::make_unique(); + service_ = std::make_unique(); builder.RegisterService(service_.get()); if (GetParam().health_check_service) { builder.RegisterService(&health_check_); diff --git a/test/cpp/end2end/channelz_service_test.cc b/test/cpp/end2end/channelz_service_test.cc index 33029a5aa1b..10dbbe06cc7 100644 --- a/test/cpp/end2end/channelz_service_test.cc +++ b/test/cpp/end2end/channelz_service_test.cc @@ -225,7 +225,7 @@ class ChannelzServerTest : public ::testing::TestWithParam { "localhost:" + to_string(backends_[i].port); backend_builder.AddListeningPort(backend_server_address, GetServerCredentials(GetParam())); - backends_[i].service = absl::make_unique(); + backends_[i].service = std::make_unique(); // ensure that the backend itself has channelz disabled. backend_builder.AddChannelArgument(GRPC_ARG_ENABLE_CHANNELZ, 0); backend_builder.RegisterService(backends_[i].service.get()); diff --git a/test/cpp/end2end/client_callback_end2end_test.cc b/test/cpp/end2end/client_callback_end2end_test.cc index 0c1377c8e88..d36dcbf93bc 100644 --- a/test/cpp/end2end/client_callback_end2end_test.cc +++ b/test/cpp/end2end/client_callback_end2end_test.cc @@ -113,7 +113,7 @@ class ClientCallbackEnd2endTest // Add 20 phony server interceptors creators.reserve(20); for (auto i = 0; i < 20; i++) { - creators.push_back(absl::make_unique()); + creators.push_back(std::make_unique()); } builder.experimental().SetInterceptorCreators(std::move(creators)); } @@ -153,7 +153,7 @@ class ClientCallbackEnd2endTest assert(false); } stub_ = grpc::testing::EchoTestService::NewStub(channel_); - generic_stub_ = absl::make_unique(channel_); + generic_stub_ = std::make_unique(channel_); PhonyInterceptor::Reset(); } @@ -275,7 +275,7 @@ class ClientCallbackEnd2endTest : reuses_remaining_(reuses), do_writes_done_(do_writes_done) { activate_ = [this, test, method_name, suffix_for_stats, test_str] { if (reuses_remaining_ > 0) { - cli_ctx_ = absl::make_unique(); + cli_ctx_ = std::make_unique(); reuses_remaining_--; StubOptions options(suffix_for_stats); test->generic_stub_->PrepareBidiStreamingCall( @@ -509,26 +509,26 @@ TEST_P(ClientCallbackEnd2endTest, SequentialRpcsWithVariedBinaryMetadataValue) { } TEST_P(ClientCallbackEnd2endTest, SequentialGenericRpcs) { - ResetStub(absl::make_unique( + ResetStub(std::make_unique( "/grpc.testing.EchoTestService/Echo", nullptr)); SendRpcsGeneric(10, false, /*suffix_for_stats=*/nullptr); } TEST_P(ClientCallbackEnd2endTest, SequentialGenericRpcsWithSuffix) { - ResetStub(absl::make_unique( + ResetStub(std::make_unique( "/grpc.testing.EchoTestService/Echo", "TestSuffix")); SendRpcsGeneric(10, false, "TestSuffix"); } TEST_P(ClientCallbackEnd2endTest, SequentialGenericRpcsAsBidi) { - ResetStub(absl::make_unique( + ResetStub(std::make_unique( "/grpc.testing.EchoTestService/Echo", nullptr)); SendGenericEchoAsBidi(10, 1, /*do_writes_done=*/true, /*suffix_for_stats=*/nullptr); } TEST_P(ClientCallbackEnd2endTest, SequentialGenericRpcsAsBidiWithSuffix) { - ResetStub(absl::make_unique( + ResetStub(std::make_unique( "/grpc.testing.EchoTestService/Echo", "TestSuffix")); SendGenericEchoAsBidi(10, 1, /*do_writes_done=*/true, "TestSuffix"); } @@ -850,7 +850,7 @@ TEST_P(ClientCallbackEnd2endTest, GenericUnaryReactor) { const std::string kMethodName("/grpc.testing.EchoTestService/Echo"); constexpr char kSuffixForStats[] = "TestSuffixForStats"; ResetStub( - absl::make_unique(kMethodName, kSuffixForStats)); + std::make_unique(kMethodName, kSuffixForStats)); class UnaryClient : public grpc::ClientUnaryReactor { public: UnaryClient(grpc::GenericStub* stub, const std::string& method_name, diff --git a/test/cpp/end2end/client_crash_test.cc b/test/cpp/end2end/client_crash_test.cc index b2f6de709c7..3fd537bdb12 100644 --- a/test/cpp/end2end/client_crash_test.cc +++ b/test/cpp/end2end/client_crash_test.cc @@ -55,7 +55,7 @@ class CrashTest : public ::testing::Test { std::ostringstream addr_stream; addr_stream << "localhost:" << port; auto addr = addr_stream.str(); - server_ = absl::make_unique(std::vector({ + server_ = std::make_unique(std::vector({ g_root + "/client_crash_test_server", "--address=" + addr, })); diff --git a/test/cpp/end2end/client_interceptors_end2end_test.cc b/test/cpp/end2end/client_interceptors_end2end_test.cc index fca1ae94419..59f089b05a6 100644 --- a/test/cpp/end2end/client_interceptors_end2end_test.cc +++ b/test/cpp/end2end/client_interceptors_end2end_test.cc @@ -837,10 +837,10 @@ TEST_P(ParameterizedClientInterceptorsEnd2endTest, PhonyInterceptor::Reset(); std::vector> creators; - creators.push_back(absl::make_unique()); + creators.push_back(std::make_unique()); // Add 20 phony interceptors for (auto i = 0; i < 20; i++) { - creators.push_back(absl::make_unique()); + creators.push_back(std::make_unique()); } auto channel = CreateClientChannel(std::move(creators)); SendRPC(channel); @@ -878,7 +878,7 @@ TEST_F(ClientInterceptorsEnd2endTest, ChannelArguments args; std::vector> creators; - creators.push_back(absl::make_unique()); + creators.push_back(std::make_unique()); auto channel = experimental::CreateCustomChannelWithInterceptors( server_address_, nullptr, args, std::move(creators)); MakeCall(channel); @@ -892,12 +892,12 @@ TEST_F(ClientInterceptorsEnd2endTest, ClientInterceptorHijackingTest) { // Add 20 phony interceptors before hijacking interceptor creators.reserve(20); for (auto i = 0; i < 20; i++) { - creators.push_back(absl::make_unique()); + creators.push_back(std::make_unique()); } - creators.push_back(absl::make_unique()); + creators.push_back(std::make_unique()); // Add 20 phony interceptors after hijacking interceptor for (auto i = 0; i < 20; i++) { - creators.push_back(absl::make_unique()); + creators.push_back(std::make_unique()); } auto channel = experimental::CreateCustomChannelWithInterceptors( server_address_, InsecureChannelCredentials(), args, std::move(creators)); @@ -910,8 +910,8 @@ TEST_F(ClientInterceptorsEnd2endTest, ClientInterceptorLogThenHijackTest) { ChannelArguments args; std::vector> creators; - creators.push_back(absl::make_unique()); - creators.push_back(absl::make_unique()); + creators.push_back(std::make_unique()); + creators.push_back(std::make_unique()); auto channel = experimental::CreateCustomChannelWithInterceptors( server_address_, InsecureChannelCredentials(), args, std::move(creators)); MakeCall(channel); @@ -927,14 +927,14 @@ TEST_F(ClientInterceptorsEnd2endTest, // Add 5 phony interceptors before hijacking interceptor creators.reserve(5); for (auto i = 0; i < 5; i++) { - creators.push_back(absl::make_unique()); + creators.push_back(std::make_unique()); } creators.push_back( std::unique_ptr( new HijackingInterceptorMakesAnotherCallFactory())); // Add 7 phony interceptors after hijacking interceptor for (auto i = 0; i < 7; i++) { - creators.push_back(absl::make_unique()); + creators.push_back(std::make_unique()); } auto channel = server_->experimental().InProcessChannelWithInterceptors( args, std::move(creators)); @@ -970,10 +970,10 @@ TEST_F(ClientInterceptorsCallbackEnd2endTest, PhonyInterceptor::Reset(); std::vector> creators; - creators.push_back(absl::make_unique()); + creators.push_back(std::make_unique()); // Add 20 phony interceptors for (auto i = 0; i < 20; i++) { - creators.push_back(absl::make_unique()); + creators.push_back(std::make_unique()); } auto channel = server_->experimental().InProcessChannelWithInterceptors( args, std::move(creators)); @@ -989,12 +989,12 @@ TEST_F(ClientInterceptorsCallbackEnd2endTest, PhonyInterceptor::Reset(); std::vector> creators; - creators.push_back(absl::make_unique()); + creators.push_back(std::make_unique()); // Add 20 phony interceptors for (auto i = 0; i < 20; i++) { - creators.push_back(absl::make_unique()); + creators.push_back(std::make_unique()); } - creators.push_back(absl::make_unique()); + creators.push_back(std::make_unique()); auto channel = server_->experimental().InProcessChannelWithInterceptors( args, std::move(creators)); MakeCallbackCall(channel); @@ -1009,11 +1009,11 @@ TEST_F(ClientInterceptorsCallbackEnd2endTest, PhonyInterceptor::Reset(); std::vector> creators; - creators.push_back(absl::make_unique()); + creators.push_back(std::make_unique()); // Add 20 phony interceptors and 20 null interceptors for (auto i = 0; i < 20; i++) { - creators.push_back(absl::make_unique()); - creators.push_back(absl::make_unique()); + creators.push_back(std::make_unique()); + creators.push_back(std::make_unique()); } auto channel = server_->experimental().InProcessChannelWithInterceptors( args, std::move(creators)); @@ -1047,10 +1047,10 @@ TEST_F(ClientInterceptorsStreamingEnd2endTest, ClientStreamingTest) { PhonyInterceptor::Reset(); std::vector> creators; - creators.push_back(absl::make_unique()); + creators.push_back(std::make_unique()); // Add 20 phony interceptors for (auto i = 0; i < 20; i++) { - creators.push_back(absl::make_unique()); + creators.push_back(std::make_unique()); } auto channel = experimental::CreateCustomChannelWithInterceptors( server_address_, InsecureChannelCredentials(), args, std::move(creators)); @@ -1065,10 +1065,10 @@ TEST_F(ClientInterceptorsStreamingEnd2endTest, ServerStreamingTest) { PhonyInterceptor::Reset(); std::vector> creators; - creators.push_back(absl::make_unique()); + creators.push_back(std::make_unique()); // Add 20 phony interceptors for (auto i = 0; i < 20; i++) { - creators.push_back(absl::make_unique()); + creators.push_back(std::make_unique()); } auto channel = experimental::CreateCustomChannelWithInterceptors( server_address_, InsecureChannelCredentials(), args, std::move(creators)); @@ -1083,7 +1083,7 @@ TEST_F(ClientInterceptorsStreamingEnd2endTest, ClientStreamingHijackingTest) { std::vector> creators; creators.push_back( - absl::make_unique()); + std::make_unique()); auto channel = experimental::CreateCustomChannelWithInterceptors( server_address_, InsecureChannelCredentials(), args, std::move(creators)); @@ -1113,7 +1113,7 @@ TEST_F(ClientInterceptorsStreamingEnd2endTest, ServerStreamingHijackingTest) { std::vector> creators; creators.push_back( - absl::make_unique()); + std::make_unique()); auto channel = experimental::CreateCustomChannelWithInterceptors( server_address_, InsecureChannelCredentials(), args, std::move(creators)); MakeServerStreamingCall(channel); @@ -1127,7 +1127,7 @@ TEST_F(ClientInterceptorsStreamingEnd2endTest, std::vector> creators; creators.push_back( - absl::make_unique()); + std::make_unique()); auto channel = experimental::CreateCustomChannelWithInterceptors( server_address_, InsecureChannelCredentials(), args, std::move(creators)); MakeAsyncCQServerStreamingCall(channel); @@ -1140,7 +1140,7 @@ TEST_F(ClientInterceptorsStreamingEnd2endTest, BidiStreamingHijackingTest) { std::vector> creators; creators.push_back( - absl::make_unique()); + std::make_unique()); auto channel = experimental::CreateCustomChannelWithInterceptors( server_address_, InsecureChannelCredentials(), args, std::move(creators)); MakeBidiStreamingCall(channel); @@ -1151,10 +1151,10 @@ TEST_F(ClientInterceptorsStreamingEnd2endTest, BidiStreamingTest) { PhonyInterceptor::Reset(); std::vector> creators; - creators.push_back(absl::make_unique()); + creators.push_back(std::make_unique()); // Add 20 phony interceptors for (auto i = 0; i < 20; i++) { - creators.push_back(absl::make_unique()); + creators.push_back(std::make_unique()); } auto channel = experimental::CreateCustomChannelWithInterceptors( server_address_, InsecureChannelCredentials(), args, std::move(creators)); @@ -1196,7 +1196,7 @@ TEST_F(ClientGlobalInterceptorEnd2endTest, PhonyGlobalInterceptor) { // Add 20 phony interceptors creators.reserve(20); for (auto i = 0; i < 20; i++) { - creators.push_back(absl::make_unique()); + creators.push_back(std::make_unique()); } auto channel = experimental::CreateCustomChannelWithInterceptors( server_address_, InsecureChannelCredentials(), args, std::move(creators)); @@ -1219,7 +1219,7 @@ TEST_F(ClientGlobalInterceptorEnd2endTest, LoggingGlobalInterceptor) { // Add 20 phony interceptors creators.reserve(20); for (auto i = 0; i < 20; i++) { - creators.push_back(absl::make_unique()); + creators.push_back(std::make_unique()); } auto channel = experimental::CreateCustomChannelWithInterceptors( server_address_, InsecureChannelCredentials(), args, std::move(creators)); @@ -1243,7 +1243,7 @@ TEST_F(ClientGlobalInterceptorEnd2endTest, HijackingGlobalInterceptor) { // Add 20 phony interceptors creators.reserve(20); for (auto i = 0; i < 20; i++) { - creators.push_back(absl::make_unique()); + creators.push_back(std::make_unique()); } auto channel = experimental::CreateCustomChannelWithInterceptors( server_address_, InsecureChannelCredentials(), args, std::move(creators)); diff --git a/test/cpp/end2end/client_lb_end2end_test.cc b/test/cpp/end2end/client_lb_end2end_test.cc index 45226eb7816..97534a4a598 100644 --- a/test/cpp/end2end/client_lb_end2end_test.cc +++ b/test/cpp/end2end/client_lb_end2end_test.cc @@ -411,7 +411,7 @@ class ClientLbEnd2endTest : public ::testing::Test { gpr_log(GPR_INFO, "starting server on port %d", port_); grpc_core::MutexLock lock(&mu_); started_ = true; - thread_ = absl::make_unique( + thread_ = std::make_unique( std::bind(&ServerData::Serve, this, server_host)); while (!server_ready_) { cond_.Wait(&mu_); @@ -2570,7 +2570,7 @@ class ClientLbAddressTest : public ClientLbEnd2endTest { explicit Attribute(const std::string& str) : str_(str) {} std::unique_ptr Copy() const override { - return absl::make_unique(str_); + return std::make_unique(str_); } int Cmp(const AttributeInterface* other) const override { @@ -2633,7 +2633,7 @@ TEST_F(ClientLbAddressTest, Basic) { // Addresses returned by the resolver will have attached attributes. response_generator.SetNextResolution(GetServersPorts(), nullptr, kAttributeKey, - absl::make_unique("foo")); + std::make_unique("foo")); CheckRpcSendOk(DEBUG_LOCATION, stub); // Check LB policy name for the channel. EXPECT_EQ("address_test_lb", channel->GetLoadBalancingPolicyName()); diff --git a/test/cpp/end2end/connection_attempt_injector.cc b/test/cpp/end2end/connection_attempt_injector.cc index 2123d6ac340..5ab2ce74306 100644 --- a/test/cpp/end2end/connection_attempt_injector.cc +++ b/test/cpp/end2end/connection_attempt_injector.cc @@ -101,7 +101,7 @@ ConnectionAttemptInjector::~ConnectionAttemptInjector() { std::unique_ptr ConnectionAttemptInjector::AddHold(int port, bool intercept_completion) { grpc_core::MutexLock lock(&mu_); - auto hold = absl::make_unique(this, port, intercept_completion); + auto hold = std::make_unique(this, port, intercept_completion); holds_.push_back(hold.get()); return hold; } @@ -129,7 +129,7 @@ void ConnectionAttemptInjector::HandleConnection( closure = GRPC_CLOSURE_INIT(&hold->on_complete_, Hold::OnComplete, hold, nullptr); } - hold->queued_attempt_ = absl::make_unique( + hold->queued_attempt_ = std::make_unique( closure, ep, interested_parties, config, addr, deadline); hold->start_cv_.Signal(); holds_.erase(it); diff --git a/test/cpp/end2end/end2end_test.cc b/test/cpp/end2end/end2end_test.cc index 9f3467d34b6..9e6f3318909 100644 --- a/test/cpp/end2end/end2end_test.cc +++ b/test/cpp/end2end/end2end_test.cc @@ -370,7 +370,7 @@ class End2endTest : public ::testing::TestWithParam { // Add 20 phony server interceptors creators.reserve(20); for (auto i = 0; i < 20; i++) { - creators.push_back(absl::make_unique()); + creators.push_back(std::make_unique()); } builder.experimental().SetInterceptorCreators(std::move(creators)); } @@ -440,7 +440,7 @@ class End2endTest : public ::testing::TestWithParam { interceptor_creators = {}) { ResetChannel(std::move(interceptor_creators)); if (GetParam().use_proxy()) { - proxy_service_ = absl::make_unique(channel_); + proxy_service_ = std::make_unique(channel_); int port = grpc_pick_unused_port_or_die(); std::ostringstream proxyaddr; proxyaddr << "localhost:" << port; @@ -1873,7 +1873,7 @@ TEST_P(SecureEnd2endTest, CallCredentialsInterception) { std::vector> interceptor_creators; interceptor_creators.push_back( - absl::make_unique()); + std::make_unique()); ResetStub(std::move(interceptor_creators)); EchoRequest request; EchoResponse response; @@ -1902,7 +1902,7 @@ TEST_P(SecureEnd2endTest, CallCredentialsInterceptionWithSetCredentials) { std::vector> interceptor_creators; interceptor_creators.push_back( - absl::make_unique()); + std::make_unique()); ResetStub(std::move(interceptor_creators)); EchoRequest request; EchoResponse response; diff --git a/test/cpp/end2end/filter_end2end_test.cc b/test/cpp/end2end/filter_end2end_test.cc index d73798ea7aa..43b7e2f740e 100644 --- a/test/cpp/end2end/filter_end2end_test.cc +++ b/test/cpp/end2end/filter_end2end_test.cc @@ -161,7 +161,7 @@ class FilterEnd2endTest : public ::testing::Test { void ResetStub() { std::shared_ptr channel = grpc::CreateChannel( server_address_.str(), InsecureChannelCredentials()); - generic_stub_ = absl::make_unique(channel); + generic_stub_ = std::make_unique(channel); ResetConnectionCounter(); ResetCallCounter(); } diff --git a/test/cpp/end2end/flaky_network_test.cc b/test/cpp/end2end/flaky_network_test.cc index 10de61eb81d..7df89eb74ba 100644 --- a/test/cpp/end2end/flaky_network_test.cc +++ b/test/cpp/end2end/flaky_network_test.cc @@ -183,7 +183,7 @@ class FlakyNetworkTest : public ::testing::TestWithParam { // ip6-looopback, but ipv6 support is not enabled by default in docker. port_ = SERVER_PORT; - server_ = absl::make_unique(port_, GetParam().credentials_type); + server_ = std::make_unique(port_, GetParam().credentials_type); server_->Start(server_host_); } void StopServer() { server_->Shutdown(); } @@ -209,7 +209,7 @@ class FlakyNetworkTest : public ::testing::TestWithParam { bool SendRpc( const std::unique_ptr& stub, int timeout_ms = 0, bool wait_for_ready = false) { - auto response = absl::make_unique(); + auto response = std::make_unique(); EchoRequest request; auto& msg = GetParam().message_content; request.set_message(msg); @@ -251,7 +251,7 @@ class FlakyNetworkTest : public ::testing::TestWithParam { std::mutex mu; std::unique_lock lock(mu); std::condition_variable cond; - thread_ = absl::make_unique( + thread_ = std::make_unique( std::bind(&ServerData::Serve, this, server_host, &mu, &cond)); cond.wait(lock, [this] { return server_ready_; }); server_ready_ = false; diff --git a/test/cpp/end2end/generic_end2end_test.cc b/test/cpp/end2end/generic_end2end_test.cc index 786b44694ba..5b67ef334ba 100644 --- a/test/cpp/end2end/generic_end2end_test.cc +++ b/test/cpp/end2end/generic_end2end_test.cc @@ -99,7 +99,7 @@ class GenericEnd2endTest : public ::testing::Test { std::shared_ptr channel = grpc::CreateChannel( server_address_.str(), InsecureChannelCredentials()); stub_ = grpc::testing::EchoTestService::NewStub(channel); - generic_stub_ = absl::make_unique(channel); + generic_stub_ = std::make_unique(channel); } void server_ok(int i) { verify_ok(srv_cq_.get(), i, true); } diff --git a/test/cpp/end2end/grpclb_end2end_test.cc b/test/cpp/end2end/grpclb_end2end_test.cc index e286672c02e..d7ef9d7a939 100644 --- a/test/cpp/end2end/grpclb_end2end_test.cc +++ b/test/cpp/end2end/grpclb_end2end_test.cc @@ -708,7 +708,7 @@ class GrpclbEnd2endTest : public ::testing::Test { // by ServerThread::Serve from firing before the wait below is hit. grpc::internal::MutexLock lock(&mu); grpc::internal::CondVar cond; - thread_ = absl::make_unique( + thread_ = std::make_unique( std::bind(&ServerThread::Serve, this, server_host, &mu, &cond)); cond.Wait(&mu); gpr_log(GPR_INFO, "%s server startup complete", type_.c_str()); diff --git a/test/cpp/end2end/interceptors_util.cc b/test/cpp/end2end/interceptors_util.cc index ca737ff77da..8c585eb9487 100644 --- a/test/cpp/end2end/interceptors_util.cc +++ b/test/cpp/end2end/interceptors_util.cc @@ -208,7 +208,7 @@ CreatePhonyClientInterceptors() { // Add 20 phony interceptors before hijacking interceptor creators.reserve(20); for (auto i = 0; i < 20; i++) { - creators.push_back(absl::make_unique()); + creators.push_back(std::make_unique()); } return creators; } diff --git a/test/cpp/end2end/nonblocking_test.cc b/test/cpp/end2end/nonblocking_test.cc index 1005d61993b..53c7d3fd60c 100644 --- a/test/cpp/end2end/nonblocking_test.cc +++ b/test/cpp/end2end/nonblocking_test.cc @@ -110,8 +110,7 @@ class NonblockingTest : public ::testing::Test { ServerBuilder builder; builder.AddListeningPort(server_address_.str(), grpc::InsecureServerCredentials()); - service_ = - absl::make_unique(); + service_ = std::make_unique(); builder.RegisterService(service_.get()); cq_ = builder.AddCompletionQueue(); server_ = builder.BuildAndStart(); diff --git a/test/cpp/end2end/proto_server_reflection_test.cc b/test/cpp/end2end/proto_server_reflection_test.cc index 53608ee20cc..fd45abd06d6 100644 --- a/test/cpp/end2end/proto_server_reflection_test.cc +++ b/test/cpp/end2end/proto_server_reflection_test.cc @@ -59,8 +59,8 @@ class ProtoServerReflectionTest : public ::testing::Test { std::shared_ptr channel = grpc::CreateChannel(target, InsecureChannelCredentials()); stub_ = grpc::testing::EchoTestService::NewStub(channel); - desc_db_ = absl::make_unique(channel); - desc_pool_ = absl::make_unique(desc_db_.get()); + desc_db_ = std::make_unique(channel); + desc_pool_ = std::make_unique(desc_db_.get()); } string to_string(const int number) { diff --git a/test/cpp/end2end/rls_end2end_test.cc b/test/cpp/end2end/rls_end2end_test.cc index b801155185f..bc750153f0e 100644 --- a/test/cpp/end2end/rls_end2end_test.cc +++ b/test/cpp/end2end/rls_end2end_test.cc @@ -177,7 +177,7 @@ class RlsEnd2endTest : public ::testing::Test { grpc_core::LocalhostResolves(&localhost_resolves_to_ipv4, &localhost_resolves_to_ipv6); ipv6_only_ = !localhost_resolves_to_ipv4 && localhost_resolves_to_ipv6; - rls_server_ = absl::make_unique>( + rls_server_ = std::make_unique>( "rls", [](grpc::ServerContext* ctx) { EXPECT_THAT(ctx->client_metadata(), ::testing::Contains( @@ -187,7 +187,7 @@ class RlsEnd2endTest : public ::testing::Test { rls_server_->Start(); // Set up client. resolver_response_generator_ = - absl::make_unique(); + std::make_unique(); ChannelArguments args; args.SetPointer(GRPC_ARG_FAKE_RESOLVER_RESPONSE_GENERATOR, resolver_response_generator_->Get()); @@ -221,7 +221,7 @@ class RlsEnd2endTest : public ::testing::Test { backends_.clear(); for (size_t i = 0; i < num_servers; ++i) { backends_.push_back( - absl::make_unique>("backend")); + std::make_unique>("backend")); backends_.back()->Start(); } } @@ -425,7 +425,7 @@ class RlsEnd2endTest : public ::testing::Test { // by ServerThread::Serve from firing before the wait below is hit. grpc::internal::MutexLock lock(&mu); grpc::internal::CondVar cond; - thread_ = absl::make_unique( + thread_ = std::make_unique( std::bind(&ServerThread::Serve, this, &mu, &cond)); cond.Wait(&mu); gpr_log(GPR_INFO, "%s server startup complete", type_.c_str()); diff --git a/test/cpp/end2end/server_builder_plugin_test.cc b/test/cpp/end2end/server_builder_plugin_test.cc index 8b6afd73f91..f206cc5332c 100644 --- a/test/cpp/end2end/server_builder_plugin_test.cc +++ b/test/cpp/end2end/server_builder_plugin_test.cc @@ -140,7 +140,7 @@ class ServerBuilderPluginTest : public ::testing::TestWithParam { void SetUp() override { port_ = grpc_pick_unused_port_or_die(); - builder_ = absl::make_unique(); + builder_ = std::make_unique(); } void InsertPlugin() { diff --git a/test/cpp/end2end/server_crash_test.cc b/test/cpp/end2end/server_crash_test.cc index ce00c1c1180..7d841f12e22 100644 --- a/test/cpp/end2end/server_crash_test.cc +++ b/test/cpp/end2end/server_crash_test.cc @@ -100,7 +100,7 @@ class CrashTest : public ::testing::Test { std::ostringstream addr_stream; addr_stream << "localhost:" << port; auto addr = addr_stream.str(); - client_ = absl::make_unique( + client_ = std::make_unique( std::vector({g_root + "/server_crash_test_client", "--address=" + addr, "--mode=" + mode})); GPR_ASSERT(client_); diff --git a/test/cpp/end2end/server_interceptors_end2end_test.cc b/test/cpp/end2end/server_interceptors_end2end_test.cc index 0936398b2df..1030f9b9917 100644 --- a/test/cpp/end2end/server_interceptors_end2end_test.cc +++ b/test/cpp/end2end/server_interceptors_end2end_test.cc @@ -249,8 +249,8 @@ class ServerInterceptorsEnd2endSyncUnaryTest : public ::testing::Test { new LoggingInterceptorFactory())); // Add 20 phony interceptor factories and null interceptor factories for (auto i = 0; i < 20; i++) { - creators.push_back(absl::make_unique()); - creators.push_back(absl::make_unique()); + creators.push_back(std::make_unique()); + creators.push_back(std::make_unique()); } builder.experimental().SetInterceptorCreators(std::move(creators)); server_ = builder.BuildAndStart(); @@ -293,7 +293,7 @@ class ServerInterceptorsEnd2endSyncStreamingTest : public ::testing::Test { std::unique_ptr( new LoggingInterceptorFactory())); for (auto i = 0; i < 20; i++) { - creators.push_back(absl::make_unique()); + creators.push_back(std::make_unique()); } builder.experimental().SetInterceptorCreators(std::move(creators)); server_ = builder.BuildAndStart(); @@ -349,7 +349,7 @@ TEST_F(ServerInterceptorsAsyncEnd2endTest, UnaryTest) { std::unique_ptr( new LoggingInterceptorFactory())); for (auto i = 0; i < 20; i++) { - creators.push_back(absl::make_unique()); + creators.push_back(std::make_unique()); } builder.experimental().SetInterceptorCreators(std::move(creators)); auto cq = builder.AddCompletionQueue(); @@ -421,7 +421,7 @@ TEST_F(ServerInterceptorsAsyncEnd2endTest, BidiStreamingTest) { std::unique_ptr( new LoggingInterceptorFactory())); for (auto i = 0; i < 20; i++) { - creators.push_back(absl::make_unique()); + creators.push_back(std::make_unique()); } builder.experimental().SetInterceptorCreators(std::move(creators)); auto cq = builder.AddCompletionQueue(); @@ -501,7 +501,7 @@ TEST_F(ServerInterceptorsAsyncEnd2endTest, GenericRPCTest) { creators; creators.reserve(20); for (auto i = 0; i < 20; i++) { - creators.push_back(absl::make_unique()); + creators.push_back(std::make_unique()); } builder.experimental().SetInterceptorCreators(std::move(creators)); auto srv_cq = builder.AddCompletionQueue(); @@ -606,7 +606,7 @@ TEST_F(ServerInterceptorsAsyncEnd2endTest, UnimplementedRpcTest) { creators; creators.reserve(20); for (auto i = 0; i < 20; i++) { - creators.push_back(absl::make_unique()); + creators.push_back(std::make_unique()); } builder.experimental().SetInterceptorCreators(std::move(creators)); auto cq = builder.AddCompletionQueue(); @@ -659,7 +659,7 @@ TEST_F(ServerInterceptorsSyncUnimplementedEnd2endTest, UnimplementedRpcTest) { creators; creators.reserve(20); for (auto i = 0; i < 20; i++) { - creators.push_back(absl::make_unique()); + creators.push_back(std::make_unique()); } builder.experimental().SetInterceptorCreators(std::move(creators)); auto server = builder.BuildAndStart(); diff --git a/test/cpp/end2end/service_config_end2end_test.cc b/test/cpp/end2end/service_config_end2end_test.cc index 183f77530a1..90eb62db255 100644 --- a/test/cpp/end2end/service_config_end2end_test.cc +++ b/test/cpp/end2end/service_config_end2end_test.cc @@ -320,7 +320,7 @@ class ServiceConfigEnd2endTest : public ::testing::Test { gpr_log(GPR_INFO, "starting server on port %d", port_); grpc::internal::MutexLock lock(&mu_); started_ = true; - thread_ = absl::make_unique( + thread_ = std::make_unique( std::bind(&ServerData::Serve, this, server_host)); while (!server_ready_) { cond_.Wait(&mu_); diff --git a/test/cpp/end2end/time_change_test.cc b/test/cpp/end2end/time_change_test.cc index 38cf9e071c3..90c4bc44bfa 100644 --- a/test/cpp/end2end/time_change_test.cc +++ b/test/cpp/end2end/time_change_test.cc @@ -139,7 +139,7 @@ class TimeChangeTest : public ::testing::Test { std::ostringstream addr_stream; addr_stream << "localhost:" << port; server_address_ = addr_stream.str(); - server_ = absl::make_unique(std::vector({ + server_ = std::make_unique(std::vector({ g_root + "/client_crash_test_server", "--address=" + server_address_, })); diff --git a/test/cpp/end2end/xds/xds_csds_end2end_test.cc b/test/cpp/end2end/xds/xds_csds_end2end_test.cc index 066ba970cba..5da43ad57f2 100644 --- a/test/cpp/end2end/xds/xds_csds_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_csds_end2end_test.cc @@ -237,7 +237,7 @@ MATCHER_P2(EqNoRdsHCM, route_configuration_name, cluster_name, class ClientStatusDiscoveryServiceTest : public XdsEnd2endTest { public: ClientStatusDiscoveryServiceTest() { - admin_server_thread_ = absl::make_unique(this); + admin_server_thread_ = std::make_unique(this); admin_server_thread_->Start(); std::string admin_server_address = absl::StrCat( ipv6_only_ ? "[::1]:" : "127.0.0.1:", admin_server_thread_->port()); diff --git a/test/cpp/end2end/xds/xds_end2end_test.cc b/test/cpp/end2end/xds/xds_end2end_test.cc index f993943b23d..9a231466417 100644 --- a/test/cpp/end2end/xds/xds_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_end2end_test.cc @@ -4086,30 +4086,28 @@ int main(int argc, char** argv) { [](grpc_core::CoreConfiguration::Builder* builder) { builder->certificate_provider_registry() ->RegisterCertificateProviderFactory( - absl::make_unique< - grpc::testing::FakeCertificateProviderFactory>( + std::make_unique( "fake1", grpc::testing::g_fake1_cert_data_map)); builder->certificate_provider_registry() ->RegisterCertificateProviderFactory( - absl::make_unique< - grpc::testing::FakeCertificateProviderFactory>( + std::make_unique( "fake2", grpc::testing::g_fake2_cert_data_map)); }); grpc_init(); grpc_core::XdsHttpFilterRegistry::RegisterFilter( - absl::make_unique( + std::make_unique( "grpc.testing.client_only_http_filter", /* supported_on_clients = */ true, /* supported_on_servers = */ false, /* is_terminal_filter */ false), {"grpc.testing.client_only_http_filter"}); grpc_core::XdsHttpFilterRegistry::RegisterFilter( - absl::make_unique( + std::make_unique( "grpc.testing.server_only_http_filter", /* supported_on_clients = */ false, /* supported_on_servers = */ true, /* is_terminal_filter */ false), {"grpc.testing.server_only_http_filter"}); grpc_core::XdsHttpFilterRegistry::RegisterFilter( - absl::make_unique( + std::make_unique( "grpc.testing.terminal_http_filter", /* supported_on_clients = */ true, /* supported_on_servers = */ true, /* is_terminal_filter */ true), diff --git a/test/cpp/end2end/xds/xds_end2end_test_lib.cc b/test/cpp/end2end/xds/xds_end2end_test_lib.cc index f52736806b1..e08006e854b 100644 --- a/test/cpp/end2end/xds/xds_end2end_test_lib.cc +++ b/test/cpp/end2end/xds/xds_end2end_test_lib.cc @@ -145,7 +145,7 @@ void XdsEnd2endTest::ServerThread::Start() { // by ServerThread::Serve from firing before the wait below is hit. grpc_core::MutexLock lock(&mu); grpc_core::CondVar cond; - thread_ = absl::make_unique( + thread_ = std::make_unique( std::bind(&ServerThread::Serve, this, &mu, &cond)); cond.Wait(&mu); gpr_log(GPR_INFO, "%s server startup complete", Type()); @@ -183,7 +183,7 @@ void XdsEnd2endTest::ServerThread::Serve(grpc_core::Mutex* mu, if (GetParam().bootstrap_source() == XdsTestType::kBootstrapFromChannelArg) { builder.SetOption( - absl::make_unique(test_obj_)); + std::make_unique(test_obj_)); } builder.set_status_notifier(¬ifier_); builder.experimental().set_drain_grace_time( @@ -533,7 +533,7 @@ void XdsEnd2endTest::TearDown() { std::unique_ptr XdsEnd2endTest::CreateAndStartBalancer() { std::unique_ptr balancer = - absl::make_unique(this); + std::make_unique(this); balancer->Start(); return balancer; } diff --git a/test/cpp/end2end/xds/xds_rls_end2end_test.cc b/test/cpp/end2end/xds/xds_rls_end2end_test.cc index 8c0c96c9bd1..c2203bbce18 100644 --- a/test/cpp/end2end/xds/xds_rls_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_rls_end2end_test.cc @@ -73,7 +73,7 @@ class RlsTest : public XdsEnd2endTest { }; RlsTest() { - rls_server_ = absl::make_unique(this); + rls_server_ = std::make_unique(this); rls_server_->Start(); } diff --git a/test/cpp/end2end/xds/xds_routing_end2end_test.cc b/test/cpp/end2end/xds/xds_routing_end2end_test.cc index f696f4bdbee..524f97e9280 100644 --- a/test/cpp/end2end/xds/xds_routing_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_routing_end2end_test.cc @@ -3187,19 +3187,19 @@ int main(int argc, char** argv) { #endif grpc_init(); grpc_core::XdsHttpFilterRegistry::RegisterFilter( - absl::make_unique( + std::make_unique( "grpc.testing.client_only_http_filter", /* supported_on_clients = */ true, /* supported_on_servers = */ false, /* is_terminal_filter */ false), {"grpc.testing.client_only_http_filter"}); grpc_core::XdsHttpFilterRegistry::RegisterFilter( - absl::make_unique( + std::make_unique( "grpc.testing.server_only_http_filter", /* supported_on_clients = */ false, /* supported_on_servers = */ true, /* is_terminal_filter */ false), {"grpc.testing.server_only_http_filter"}); grpc_core::XdsHttpFilterRegistry::RegisterFilter( - absl::make_unique( + std::make_unique( "grpc.testing.terminal_http_filter", /* supported_on_clients = */ true, /* supported_on_servers = */ true, /* is_terminal_filter */ true), diff --git a/test/cpp/naming/resolver_component_test.cc b/test/cpp/naming/resolver_component_test.cc index d9086265027..ab401ca785b 100644 --- a/test/cpp/naming/resolver_component_test.cc +++ b/test/cpp/naming/resolver_component_test.cc @@ -584,7 +584,7 @@ void RunResolvesRelevantRecordsTest( std::unique_ptr fake_non_responsive_dns_server; if (absl::GetFlag(FLAGS_inject_broken_nameserver_list) == "True") { - fake_non_responsive_dns_server = absl::make_unique< + fake_non_responsive_dns_server = std::make_unique< grpc_core::testing::FakeUdpAndTcpServer>( grpc_core::testing::FakeUdpAndTcpServer::AcceptMode:: kWaitForClientToSendFirstBytes, diff --git a/test/cpp/qps/client.h b/test/cpp/qps/client.h index 4ef14cd07f6..6495a368742 100644 --- a/test/cpp/qps/client.h +++ b/test/cpp/qps/client.h @@ -370,8 +370,8 @@ class Client { // Closed-loop doesn't use random dist at all break; case LoadParams::kPoisson: - random_dist = absl::make_unique(load.poisson().offered_load() / - num_threads); + random_dist = std::make_unique(load.poisson().offered_load() / + num_threads); break; default: GPR_ASSERT(false); diff --git a/test/cpp/qps/client_async.cc b/test/cpp/qps/client_async.cc index 4e57de3ad5b..f2aed3c2e04 100644 --- a/test/cpp/qps/client_async.cc +++ b/test/cpp/qps/client_async.cc @@ -142,7 +142,7 @@ class ClientRpcContextUnaryImpl : public ClientRpcContext { if (!next_issue_) { // ready to issue RunNextState(true, nullptr); } else { // wait for the issue time - alarm_ = absl::make_unique(); + alarm_ = std::make_unique(); alarm_->Set(cq_, next_issue_(), ClientRpcContext::tag(this)); } } @@ -371,7 +371,7 @@ class ClientRpcContextStreamingPingPongImpl : public ClientRpcContext { break; // loop around, don't return case State::WAIT: next_state_ = State::READY_TO_WRITE; - alarm_ = absl::make_unique(); + alarm_ = std::make_unique(); alarm_->Set(cq_, next_issue_(), ClientRpcContext::tag(this)); return true; case State::READY_TO_WRITE: @@ -556,7 +556,7 @@ class ClientRpcContextStreamingFromClientImpl : public ClientRpcContext { } break; // loop around, don't return case State::WAIT: - alarm_ = absl::make_unique(); + alarm_ = std::make_unique(); alarm_->Set(cq_, next_issue_(), ClientRpcContext::tag(this)); next_state_ = State::READY_TO_WRITE; return true; @@ -804,7 +804,7 @@ class ClientRpcContextGenericStreamingImpl : public ClientRpcContext { break; // loop around, don't return case State::WAIT: next_state_ = State::READY_TO_WRITE; - alarm_ = absl::make_unique(); + alarm_ = std::make_unique(); alarm_->Set(cq_, next_issue_(), ClientRpcContext::tag(this)); return true; case State::READY_TO_WRITE: @@ -899,7 +899,7 @@ class ClientRpcContextGenericStreamingImpl : public ClientRpcContext { static std::unique_ptr GenericStubCreator( const std::shared_ptr& ch) { - return absl::make_unique(ch); + return std::make_unique(ch); } class GenericAsyncStreamingClient final diff --git a/test/cpp/qps/client_callback.cc b/test/cpp/qps/client_callback.cc index 52ab66edeb0..01985a74148 100644 --- a/test/cpp/qps/client_callback.cc +++ b/test/cpp/qps/client_callback.cc @@ -174,7 +174,7 @@ class CallbackUnaryClient final : public CallbackClient { // Start an alarm callback to run the internal callback after // next_issue_time if (ctx_[vector_idx]->alarm_ == nullptr) { - ctx_[vector_idx]->alarm_ = absl::make_unique(); + ctx_[vector_idx]->alarm_ = std::make_unique(); } ctx_[vector_idx]->alarm_->Set(next_issue_time, [this, t, vector_idx](bool /*ok*/) { @@ -203,7 +203,7 @@ class CallbackUnaryClient final : public CallbackClient { NotifyMainThreadOfThreadCompletion(); } else { // Reallocate ctx for next RPC - ctx_[vector_idx] = absl::make_unique( + ctx_[vector_idx] = std::make_unique( ctx_[vector_idx]->stub_); // Schedule a new RPC ScheduleRpc(t, vector_idx); @@ -309,7 +309,7 @@ class CallbackStreamingPingPongReactor final client_->NotifyMainThreadOfThreadCompletion(); return; } - ctx_ = absl::make_unique(ctx_->stub_); + ctx_ = std::make_unique(ctx_->stub_); ScheduleRpc(); } @@ -319,7 +319,7 @@ class CallbackStreamingPingPongReactor final // Start an alarm callback to run the internal callback after // next_issue_time if (ctx_->alarm_ == nullptr) { - ctx_->alarm_ = absl::make_unique(); + ctx_->alarm_ = std::make_unique(); } ctx_->alarm_->Set(next_issue_time, [this](bool /*ok*/) { StartNewRpc(); }); diff --git a/test/cpp/qps/qps_server_builder.cc b/test/cpp/qps/qps_server_builder.cc index 4b515a12612..05d45455740 100644 --- a/test/cpp/qps/qps_server_builder.cc +++ b/test/cpp/qps/qps_server_builder.cc @@ -27,7 +27,7 @@ namespace testing { namespace { std::unique_ptr DefaultCreateQpsServerBuilder() { - return absl::make_unique(); + return std::make_unique(); } std::function()> g_create_qps_server_builder = diff --git a/test/cpp/qps/qps_worker.cc b/test/cpp/qps/qps_worker.cc index cd916bfaece..c083575aab2 100644 --- a/test/cpp/qps/qps_worker.cc +++ b/test/cpp/qps/qps_worker.cc @@ -276,7 +276,7 @@ class WorkerServiceImpl final : public WorkerService::Service { QpsWorker::QpsWorker(int driver_port, int server_port, const std::string& credential_type) { - impl_ = absl::make_unique(server_port, this); + impl_ = std::make_unique(server_port, this); gpr_atm_rel_store(&done_, static_cast(0)); std::unique_ptr builder = CreateQpsServerBuilder(); diff --git a/test/cpp/server/authorization_policy_provider_test.cc b/test/cpp/server/authorization_policy_provider_test.cc index 654dd067762..f6f6e0978c0 100644 --- a/test/cpp/server/authorization_policy_provider_test.cc +++ b/test/cpp/server/authorization_policy_provider_test.cc @@ -48,7 +48,7 @@ TEST(AuthorizationPolicyProviderTest, StaticDataCreateReturnsErrorStatus) { } TEST(AuthorizationPolicyProviderTest, FileWatcherCreateReturnsProvider) { - auto tmp_authz_policy = absl::make_unique( + auto tmp_authz_policy = std::make_unique( grpc_core::testing::GetFileContents(VALID_POLICY_PATH_1)); grpc::Status status; auto provider = experimental::FileWatcherAuthorizationPolicyProvider::Create( @@ -60,7 +60,7 @@ TEST(AuthorizationPolicyProviderTest, FileWatcherCreateReturnsProvider) { } TEST(AuthorizationPolicyProviderTest, FileWatcherCreateReturnsErrorStatus) { - auto tmp_authz_policy = absl::make_unique( + auto tmp_authz_policy = std::make_unique( grpc_core::testing::GetFileContents(INVALID_POLICY_PATH)); grpc::Status status; auto provider = experimental::FileWatcherAuthorizationPolicyProvider::Create( diff --git a/test/cpp/server/load_reporter/load_reporter_test.cc b/test/cpp/server/load_reporter/load_reporter_test.cc index 6eeb225d5c3..f18ee1ef7b4 100644 --- a/test/cpp/server/load_reporter/load_reporter_test.cc +++ b/test/cpp/server/load_reporter/load_reporter_test.cc @@ -140,7 +140,7 @@ class LoadReporterTest : public ::testing::Test { EXPECT_CALL(*mock_cpu, GetCpuStats()) .WillOnce(Return(initial_cpu_stats_)) .RetiresOnSaturation(); - load_reporter_ = absl::make_unique( + load_reporter_ = std::make_unique( kFeedbackSampleWindowSeconds, std::unique_ptr(mock_census), std::unique_ptr(mock_cpu)); diff --git a/test/cpp/test/mock_stream_test.cc b/test/cpp/test/mock_stream_test.cc index 646596b1177..2c7c5e59c83 100644 --- a/test/cpp/test/mock_stream_test.cc +++ b/test/cpp/test/mock_stream_test.cc @@ -28,39 +28,39 @@ using grpc::testing::EchoRequest; using grpc::testing::EchoResponse; TEST(MockStreamTest, Basic) { - auto cr = absl::make_unique>(); + auto cr = std::make_unique>(); ASSERT_NE(cr, nullptr); - auto cw = absl::make_unique>(); + auto cw = std::make_unique>(); ASSERT_NE(cw, nullptr); - auto crw = absl::make_unique< + auto crw = std::make_unique< grpc::testing::MockClientReaderWriter>(); ASSERT_NE(crw, nullptr); - auto carr = absl::make_unique< + auto carr = std::make_unique< grpc::testing::MockClientAsyncResponseReader>(); ASSERT_NE(carr, nullptr); auto car = - absl::make_unique>(); + std::make_unique>(); ASSERT_NE(car, nullptr); auto caw = - absl::make_unique>(); + std::make_unique>(); ASSERT_NE(caw, nullptr); - auto carw = absl::make_unique< + auto carw = std::make_unique< grpc::testing::MockClientAsyncReaderWriter>(); ASSERT_NE(carw, nullptr); - auto sr = absl::make_unique>(); + auto sr = std::make_unique>(); ASSERT_NE(sr, nullptr); - auto sw = absl::make_unique>(); + auto sw = std::make_unique>(); ASSERT_NE(sw, nullptr); - auto srw = absl::make_unique< + auto srw = std::make_unique< grpc::testing::MockServerReaderWriter>(); ASSERT_NE(srw, nullptr); } diff --git a/test/cpp/util/byte_buffer_proto_helper.cc b/test/cpp/util/byte_buffer_proto_helper.cc index efccb8633a7..86271c988d4 100644 --- a/test/cpp/util/byte_buffer_proto_helper.cc +++ b/test/cpp/util/byte_buffer_proto_helper.cc @@ -39,7 +39,7 @@ std::unique_ptr SerializeToByteBuffer( std::string buf; message->SerializeToString(&buf); Slice slice(buf); - return absl::make_unique(&slice, 1); + return std::make_unique(&slice, 1); } bool SerializeToByteBufferInPlace(grpc::protobuf::Message* message, diff --git a/test/cpp/util/grpc_tool.cc b/test/cpp/util/grpc_tool.cc index d2238db2853..84846d741a8 100644 --- a/test/cpp/util/grpc_tool.cc +++ b/test/cpp/util/grpc_tool.cc @@ -537,7 +537,7 @@ bool GrpcTool::CallMethod(int argc, const char** argv, if (!absl::GetFlag(FLAGS_binary_input) || !absl::GetFlag(FLAGS_binary_output)) { - parser = absl::make_unique( + parser = std::make_unique( absl::GetFlag(FLAGS_remotedb) ? channel : nullptr, absl::GetFlag(FLAGS_proto_path), absl::GetFlag(FLAGS_protofiles)); if (parser->HasError()) { @@ -923,7 +923,7 @@ bool GrpcTool::ParseMessage(int argc, const char** argv, !absl::GetFlag(FLAGS_binary_output)) { std::shared_ptr channel = CreateCliChannel(server_address, cred, grpc::ChannelArguments()); - parser = absl::make_unique( + parser = std::make_unique( absl::GetFlag(FLAGS_remotedb) ? channel : nullptr, absl::GetFlag(FLAGS_proto_path), absl::GetFlag(FLAGS_protofiles)); if (parser->HasError()) { diff --git a/test/cpp/util/proto_file_parser.cc b/test/cpp/util/proto_file_parser.cc index 7a977f3148f..92bbf4241d2 100644 --- a/test/cpp/util/proto_file_parser.cc +++ b/test/cpp/util/proto_file_parser.cc @@ -74,7 +74,7 @@ ProtoFileParser::ProtoFileParser(const std::shared_ptr& channel, std::vector service_list; if (channel) { reflection_db_ = - absl::make_unique(channel); + std::make_unique(channel); reflection_db_->GetServices(&service_list); } @@ -84,8 +84,8 @@ ProtoFileParser::ProtoFileParser(const std::shared_ptr& channel, proto_path, GRPC_CLI_PATH_SEPARATOR, absl::AllowEmpty())) { source_tree_.MapPath("", std::string(single_path)); } - error_printer_ = absl::make_unique(this); - importer_ = absl::make_unique( + error_printer_ = std::make_unique(this); + importer_ = std::make_unique( &source_tree_, error_printer_.get()); std::string file_name; @@ -103,7 +103,7 @@ ProtoFileParser::ProtoFileParser(const std::shared_ptr& channel, } file_db_ = - absl::make_unique(*importer_->pool()); + std::make_unique(*importer_->pool()); } if (!reflection_db_ && !file_db_) { @@ -116,11 +116,11 @@ ProtoFileParser::ProtoFileParser(const std::shared_ptr& channel, } else if (!file_db_) { desc_db_ = std::move(reflection_db_); } else { - desc_db_ = absl::make_unique( + desc_db_ = std::make_unique( reflection_db_.get(), file_db_.get()); } - desc_pool_ = absl::make_unique(desc_db_.get()); + desc_pool_ = std::make_unique(desc_db_.get()); for (auto it = service_list.begin(); it != service_list.end(); it++) { if (known_services.find(*it) == known_services.end()) { diff --git a/tools/codegen/core/gen_huffman_decompressor.cc b/tools/codegen/core/gen_huffman_decompressor.cc index 518b48195c5..19d81d11fa5 100644 --- a/tools/codegen/core/gen_huffman_decompressor.cc +++ b/tools/codegen/core/gen_huffman_decompressor.cc @@ -357,13 +357,13 @@ class Sink : public Item { // Add one string to our output. void Add(std::string s) { - children_.push_back(absl::make_unique(std::move(s))); + children_.push_back(std::make_unique(std::move(s))); } // Add an item of type T to our output (constructing it with args). template T* Add(Args&&... args) { - auto v = absl::make_unique(std::forward(args)...); + auto v = std::make_unique(std::forward(args)...); auto* r = v.get(); children_.push_back(std::move(v)); return r; @@ -819,7 +819,7 @@ class TableBuilder { // Given a number of slices (2**slice_bits), generate a table that uses a // single level lookup for each slice based on our input. std::unique_ptr MakeTable(size_t slice_bits) const { - std::unique_ptr
table = absl::make_unique
(); + std::unique_ptr
table = std::make_unique
(); int slices = 1 << slice_bits; table->slices.resize(slices); table->slice_bits = slice_bits; @@ -1180,8 +1180,8 @@ struct BuildOutput { // Given max_bits_for_depth = {n1,n2,n3,...} // Build a decoder that first considers n1 bits, then n2, then n3, ... BuildOutput Build(std::vector max_bits_for_depth) { - auto hdr = absl::make_unique(); - auto src = absl::make_unique(); + auto hdr = std::make_unique(); + auto src = std::make_unique(); hdr->Add(); src->Add(); hdr->Add("#ifndef GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_DECODE_HUFF_H"); @@ -1291,7 +1291,7 @@ int main(void) { threads.front().join(); threads.pop(); } - results.emplace_back(absl::make_unique()); + results.emplace_back(std::make_unique()); threads.emplace([perm, r = results.back().get()] { *r = Build(perm); }); } while (!threads.empty()) { diff --git a/tools/run_tests/sanity/core_banned_functions.py b/tools/run_tests/sanity/core_banned_functions.py index cc444be54da..2bfa004e4b3 100755 --- a/tools/run_tests/sanity/core_banned_functions.py +++ b/tools/run_tests/sanity/core_banned_functions.py @@ -58,7 +58,9 @@ BANNED_EXCEPT = { ], # Use `std::exchange()` instead. - 'absl::exchange': [] + 'absl::exchange': [], + # Use `std::make_unique()` instead. + 'absl::make_unique': [], } errors = 0