Remove rtc_base/scoped_ref_ptr.h.

The type rtc::scoped_refptr<T> is now part of api/. Please include it from
api/scoped_refptr.h.

More info: See: https://groups.google.com/forum/#!topic/discuss-webrtc/Mme2MSz4z4o.

Bug: webrtc:9887, webrtc:8205
No-Try: True
Change-Id: Ic6c7c81e226e59f12f7933e472f573ae097b55bf
Reviewed-on: https://webrtc-review.googlesource.com/c/119041
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26414}

api/BUILD.gn

@@ -46,6 +46,7 @@ rtc_static_library("create_peerconnection_factory") {
     ":callfactory_api",
     ":fec_controller_api",
     ":libjingle_peerconnection_api",
+    ":scoped_refptr",
     "../logging:rtc_event_log_api",
     "../logging:rtc_event_log_impl_base",
     "../media:rtc_audio_video",
@@ -54,7 +55,6 @@ rtc_static_library("create_peerconnection_factory") {
     "../modules/audio_processing:api",
     "../pc:peerconnection",
     "../rtc_base:deprecation",
-    "../rtc_base:ptr_util",
     "../rtc_base:rtc_base",
     "../rtc_base:rtc_base_approved",
     "audio:audio_mixer_api",
@@ -157,6 +157,7 @@ rtc_static_library("libjingle_peerconnection_api") {
     ":fec_controller_api",
     ":libjingle_logging_api",
     ":rtc_stats_api",
+    ":scoped_refptr",
     "audio:audio_mixer_api",
     "audio_codecs:audio_codecs_api",
     "transport:bitrate_settings",
@@ -244,8 +245,8 @@ if (rtc_include_tests) {
     ]
     deps = [
       ":fec_controller_api",
+      ":scoped_refptr",
       ":video_quality_test_fixture_api",
-      "../rtc_base:ptr_util",
       "../video:video_quality_test",
       "//third_party/abseil-cpp/absl/memory",
     ]
@@ -295,6 +296,7 @@ rtc_source_set("rtc_stats_api") {
   ]
 
   deps = [
+    ":scoped_refptr",
     "../rtc_base:checks",
     "../rtc_base:rtc_base_approved",
     "../rtc_base/system:rtc_export",

api/DEPS

@@ -68,7 +68,6 @@ specific_include_rules = {
 
   "create_peerconnection_factory\.h": [
     "+rtc_base/deprecation.h",
-    "+rtc_base/scoped_ref_ptr.h",
   ],
 
   "data_channel_interface\.h": [
@@ -103,7 +102,6 @@ specific_include_rules = {
   "media_stream_interface\.h": [
     "+modules/audio_processing/include/audio_processing_statistics.h",
     "+rtc_base/ref_count.h",
-    "+rtc_base/scoped_ref_ptr.h",
   ],
 
   "media_transport_interface\.h": [
@@ -137,7 +135,6 @@ specific_include_rules = {
     "+rtc_base/message_handler.h",  # Inherits from it.
     "+rtc_base/message_queue.h",    # Inherits from MessageData.
     "+rtc_base/ref_counted_object.h",
-    "+rtc_base/scoped_ref_ptr.h",
     "+rtc_base/thread.h",
   ],
 
@@ -153,17 +150,14 @@ specific_include_rules = {
 
   "rtp_receiver_interface\.h": [
     "+rtc_base/ref_count.h",
-    "+rtc_base/scoped_ref_ptr.h",
   ],
 
   "rtp_sender_interface\.h": [
     "+rtc_base/ref_count.h",
-    "+rtc_base/scoped_ref_ptr.h",
   ],
 
   "rtp_transceiver_interface\.h": [
     "+rtc_base/ref_count.h",
-    "+rtc_base/scoped_ref_ptr.h",
   ],
 
   "set_remote_description_observer_interface\.h": [
@@ -173,7 +167,6 @@ specific_include_rules = {
   "stats_types\.h": [
     "+rtc_base/constructor_magic.h",
     "+rtc_base/ref_count.h",
-    "+rtc_base/scoped_ref_ptr.h",
     "+rtc_base/string_encode.h",
     "+rtc_base/thread_checker.h",
   ],
@@ -201,7 +194,6 @@ specific_include_rules = {
 
   "audio_decoder_factory_template\.h": [
     "+rtc_base/ref_counted_object.h",
-    "+rtc_base/scoped_ref_ptr.h",
   ],
 
   "audio_encoder\.h": [
@@ -215,15 +207,6 @@ specific_include_rules = {
 
   "audio_encoder_factory_template\.h": [
     "+rtc_base/ref_counted_object.h",
-    "+rtc_base/scoped_ref_ptr.h",
-  ],
-
-  "builtin_audio_decoder_factory\.h": [
-    "+rtc_base/scoped_ref_ptr.h",
-  ],
-
-  "builtin_audio_encoder_factory\.h": [
-    "+rtc_base/scoped_ref_ptr.h",
   ],
 
   "frame_decryptor_interface\.h": [
@@ -236,13 +219,11 @@ specific_include_rules = {
 
   "rtc_stats_collector_callback\.h": [
     "+rtc_base/ref_count.h",
-    "+rtc_base/scoped_ref_ptr.h",
   ],
 
   "rtc_stats_report\.h": [
     "+rtc_base/ref_count.h",
     "+rtc_base/ref_counted_object.h",
-    "+rtc_base/scoped_ref_ptr.h",
   ],
 
   "audioproc_float\.h": [
@@ -281,7 +262,6 @@ specific_include_rules = {
 
   "video_encoder_config\.h": [
     "+rtc_base/ref_count.h",
-    "+rtc_base/scoped_ref_ptr.h",
   ],
 
   # .cc files in api/ should not be restricted in what they can #include,

api/audio_codecs/BUILD.gn

@@ -31,6 +31,7 @@ rtc_source_set("audio_codecs_api") {
   deps = [
     "..:array_view",
     "..:bitrate_allocation",
+    "..:scoped_refptr",
     "../..:webrtc_common",
     "../../rtc_base:checks",
     "../../rtc_base:deprecation",
@@ -51,6 +52,7 @@ rtc_static_library("builtin_audio_decoder_factory") {
   ]
   deps = [
     ":audio_codecs_api",
+    "..:scoped_refptr",
     "../../rtc_base:rtc_base_approved",
     "L16:audio_decoder_L16",
     "g711:audio_decoder_g711",
@@ -81,6 +83,7 @@ rtc_static_library("builtin_audio_encoder_factory") {
   ]
   deps = [
     ":audio_codecs_api",
+    "..:scoped_refptr",
     "../../rtc_base:rtc_base_approved",
     "L16:audio_encoder_L16",
     "g711:audio_encoder_g711",

api/audio_codecs/audio_decoder_factory_template.h

@@ -15,8 +15,8 @@
 #include <vector>
 
 #include "api/audio_codecs/audio_decoder_factory.h"
+#include "api/scoped_refptr.h"
 #include "rtc_base/ref_counted_object.h"
-#include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
 

api/audio_codecs/audio_encoder_factory_template.h

@@ -15,8 +15,8 @@
 #include <vector>
 
 #include "api/audio_codecs/audio_encoder_factory.h"
+#include "api/scoped_refptr.h"
 #include "rtc_base/ref_counted_object.h"
-#include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
 

api/audio_codecs/builtin_audio_decoder_factory.h

@@ -12,7 +12,7 @@
 #define API_AUDIO_CODECS_BUILTIN_AUDIO_DECODER_FACTORY_H_
 
 #include "api/audio_codecs/audio_decoder_factory.h"
-#include "rtc_base/scoped_ref_ptr.h"
+#include "api/scoped_refptr.h"
 
 namespace webrtc {
 

api/audio_codecs/builtin_audio_encoder_factory.h

@@ -12,7 +12,7 @@
 #define API_AUDIO_CODECS_BUILTIN_AUDIO_ENCODER_FACTORY_H_
 
 #include "api/audio_codecs/audio_encoder_factory.h"
-#include "rtc_base/scoped_ref_ptr.h"
+#include "api/scoped_refptr.h"
 
 namespace webrtc {
 

api/create_peerconnection_factory.cc

@@ -19,6 +19,7 @@
 #include "api/call/call_factory_interface.h"
 #include "api/fec_controller.h"
 #include "api/peer_connection_interface.h"
+#include "api/scoped_refptr.h"
 #include "api/transport/network_control.h"
 #include "api/video_codecs/video_decoder_factory.h"
 #include "api/video_codecs/video_encoder_factory.h"
@@ -28,7 +29,6 @@
 #include "media/engine/webrtc_media_engine.h"
 #include "modules/audio_device/include/audio_device.h"
 #include "modules/audio_processing/include/audio_processing.h"
-#include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/thread.h"
 
 namespace webrtc {

api/create_peerconnection_factory.h

@@ -18,9 +18,9 @@
 #include "api/audio_codecs/audio_encoder_factory.h"
 #include "api/fec_controller.h"
 #include "api/peer_connection_interface.h"
+#include "api/scoped_refptr.h"
 #include "api/transport/network_control.h"
 #include "rtc_base/deprecation.h"
-#include "rtc_base/scoped_ref_ptr.h"
 
 namespace rtc {
 // TODO(bugs.webrtc.org/9987): Move rtc::Thread to api/ or expose a better

api/media_stream_interface.h

@@ -24,12 +24,12 @@
 
 #include "absl/types/optional.h"
 #include "api/audio_options.h"
+#include "api/scoped_refptr.h"
 #include "api/video/video_frame.h"
 #include "api/video/video_sink_interface.h"
 #include "api/video/video_source_interface.h"
 #include "modules/audio_processing/include/audio_processing_statistics.h"
 #include "rtc_base/ref_count.h"
-#include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
 

api/proxy.h

@@ -56,11 +56,11 @@
 #include <string>
 #include <utility>
 
+#include "api/scoped_refptr.h"
 #include "rtc_base/event.h"
 #include "rtc_base/message_handler.h"
 #include "rtc_base/message_queue.h"
 #include "rtc_base/ref_counted_object.h"
-#include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/thread.h"
 
 namespace rtc {

api/rtp_receiver_interface.h

@@ -23,8 +23,8 @@
 #include "api/media_types.h"
 #include "api/proxy.h"
 #include "api/rtp_parameters.h"
+#include "api/scoped_refptr.h"
 #include "rtc_base/ref_count.h"
-#include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
 

api/rtp_sender_interface.h

@@ -25,8 +25,8 @@
 #include "api/proxy.h"
 #include "api/rtc_error.h"
 #include "api/rtp_parameters.h"
+#include "api/scoped_refptr.h"
 #include "rtc_base/ref_count.h"
-#include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
 

api/rtp_transceiver_interface.h

@@ -20,8 +20,8 @@
 #include "api/rtp_parameters.h"
 #include "api/rtp_receiver_interface.h"
 #include "api/rtp_sender_interface.h"
+#include "api/scoped_refptr.h"
 #include "rtc_base/ref_count.h"
-#include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
 

api/stats/rtc_stats_collector_callback.h

@@ -11,9 +11,9 @@
 #ifndef API_STATS_RTC_STATS_COLLECTOR_CALLBACK_H_
 #define API_STATS_RTC_STATS_COLLECTOR_CALLBACK_H_
 
+#include "api/scoped_refptr.h"
 #include "api/stats/rtc_stats_report.h"
 #include "rtc_base/ref_count.h"
-#include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
 

api/stats/rtc_stats_report.h

@@ -18,10 +18,10 @@
 #include <string>
 #include <vector>
 
+#include "api/scoped_refptr.h"
 #include "api/stats/rtc_stats.h"
 #include "rtc_base/ref_count.h"
 #include "rtc_base/ref_counted_object.h"
-#include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/system/rtc_export.h"
 
 namespace webrtc {

api/stats_types.h

@@ -20,9 +20,9 @@
 #include <string>
 #include <vector>
 
+#include "api/scoped_refptr.h"
 #include "rtc_base/constructor_magic.h"
 #include "rtc_base/ref_count.h"
-#include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/string_encode.h"
 #include "rtc_base/thread_checker.h"
 

api/video/BUILD.gn

@@ -33,6 +33,7 @@ rtc_source_set("video_frame") {
 
   deps = [
     "..:array_view",
+    "..:scoped_refptr",
     "../../rtc_base:checks",
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base/system:rtc_export",
@@ -48,6 +49,7 @@ rtc_source_set("video_frame_i420") {
   ]
   deps = [
     ":video_frame",
+    "..:scoped_refptr",
     "../../rtc_base:checks",
     "../../rtc_base:rtc_base",
     "../../rtc_base/memory:aligned_malloc",
@@ -65,6 +67,7 @@ rtc_source_set("video_frame_i010") {
   deps = [
     ":video_frame",
     ":video_frame_i420",
+    "..:scoped_refptr",
     "../../rtc_base:checks",
     "../../rtc_base:rtc_base",
     "../../rtc_base/memory:aligned_malloc",
@@ -211,7 +214,7 @@ rtc_source_set("video_stream_encoder_create") {
   deps = [
     ":video_frame",
     ":video_stream_encoder",
-    "../../rtc_base:ptr_util",
+    "../../api:scoped_refptr",
     "../../video:video_stream_encoder_impl",
     "../video_codecs:video_codecs_api",
     "//third_party/abseil-cpp/absl/memory",
@@ -230,10 +233,10 @@ rtc_static_library("builtin_video_bitrate_allocator_factory") {
     ":video_bitrate_allocator",
     ":video_bitrate_allocator_factory",
     "../../:webrtc_common",
+    "../../api:scoped_refptr",
     "../../media:rtc_media_base",
     "../../modules/video_coding:video_coding_utility",
     "../../modules/video_coding:webrtc_vp9_helpers",
-    "../../rtc_base:ptr_util",
     "../../rtc_base/system:fallthrough",
     "../video_codecs:video_codecs_api",
     "//third_party/abseil-cpp/absl/memory",

api/video/DEPS

@@ -8,21 +8,17 @@ specific_include_rules = {
 
   "i010_buffer\.h": [
     "+rtc_base/memory/aligned_malloc.h",
-    "+rtc_base/scoped_ref_ptr.h",
   ],
 
   "i420_buffer\.h": [
     "+rtc_base/memory/aligned_malloc.h",
-    "+rtc_base/scoped_ref_ptr.h",
   ],
 
   "video_frame\.h": [
-    "+rtc_base/scoped_ref_ptr.h",
   ],
 
   "video_frame_buffer\.h": [
     "+rtc_base/ref_count.h",
-    "+rtc_base/scoped_ref_ptr.h",
   ],
 
   "video_stream_decoder_create.cc": [

api/video/i010_buffer.h

@@ -14,10 +14,10 @@
 #include <stdint.h>
 #include <memory>
 
+#include "api/scoped_refptr.h"
 #include "api/video/video_frame_buffer.h"
 #include "api/video/video_rotation.h"
 #include "rtc_base/memory/aligned_malloc.h"
-#include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
 

api/video/i420_buffer.h

@@ -14,10 +14,10 @@
 #include <stdint.h>
 #include <memory>
 
+#include "api/scoped_refptr.h"
 #include "api/video/video_frame_buffer.h"
 #include "api/video/video_rotation.h"
 #include "rtc_base/memory/aligned_malloc.h"
-#include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/system/rtc_export.h"
 
 namespace webrtc {

api/video/video_frame.h

@@ -14,11 +14,11 @@
 #include <stdint.h>
 
 #include "absl/types/optional.h"
+#include "api/scoped_refptr.h"
 #include "api/video/color_space.h"
 #include "api/video/hdr_metadata.h"
 #include "api/video/video_frame_buffer.h"
 #include "api/video/video_rotation.h"
-#include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/system/rtc_export.h"
 
 namespace webrtc {

api/video/video_frame_buffer.h

@@ -13,8 +13,8 @@
 
 #include <stdint.h>
 
+#include "api/scoped_refptr.h"
 #include "rtc_base/ref_count.h"
-#include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
 

api/video_codecs/BUILD.gn

@@ -32,6 +32,7 @@ rtc_source_set("video_codecs_api") {
   ]
 
   deps = [
+    "..:scoped_refptr",
     "../..:webrtc_common",
     "../../rtc_base:checks",
     "../../rtc_base:rtc_base_approved",
@@ -59,8 +60,8 @@ rtc_static_library("builtin_video_decoder_factory") {
 
   deps = [
     ":video_codecs_api",
+    "../../api:scoped_refptr",
     "../../media:rtc_internal_video_codecs",
-    "../../rtc_base:ptr_util",
     "../../rtc_base/system:rtc_export",
     "//third_party/abseil-cpp/absl/memory",
   ]
@@ -79,11 +80,11 @@ rtc_static_library("builtin_video_encoder_factory") {
 
   deps = [
     ":video_codecs_api",
+    "../../api:scoped_refptr",
     "../../media:rtc_encoder_simulcast_proxy",
     "../../media:rtc_internal_video_codecs",
     "../../media:rtc_media_base",
     "../../rtc_base:checks",
-    "../../rtc_base:ptr_util",
     "../../rtc_base/system:rtc_export",
     "//third_party/abseil-cpp/absl/memory",
     "//third_party/abseil-cpp/absl/strings",

api/video_codecs/test/BUILD.gn

@@ -23,12 +23,12 @@ if (rtc_include_tests) {
       "..:video_codecs_api",
       "../..:mock_video_encoder",
       "../../../:webrtc_common",
+      "../../../api:scoped_refptr",
       "../../../modules:module_api",
       "../../../modules/video_coding:video_codec_interface",
       "../../../modules/video_coding:video_coding_utility",
       "../../../modules/video_coding:webrtc_vp8",
       "../../../rtc_base:checks",
-      "../../../rtc_base:ptr_util",
       "../../../rtc_base:rtc_base_tests_utils",
       "../../../test:field_trial",
       "../../../test:test_support",

api/video_codecs/test/video_encoder_software_fallback_wrapper_unittest.cc

@@ -16,6 +16,7 @@
 
 #include "absl/memory/memory.h"
 #include "absl/types/optional.h"
+#include "api/scoped_refptr.h"
 #include "api/test/mock_video_encoder.h"
 #include "api/video/encoded_image.h"
 #include "api/video/i420_buffer.h"
@@ -33,7 +34,6 @@
 #include "modules/video_coding/include/video_error_codes.h"
 #include "modules/video_coding/utility/simulcast_rate_allocator.h"
 #include "rtc_base/fake_clock.h"
-#include "rtc_base/scoped_ref_ptr.h"
 #include "test/field_trial.h"
 #include "test/gmock.h"
 #include "test/gtest.h"

api/video_codecs/video_encoder_config.h

@@ -16,10 +16,10 @@
 #include <vector>
 
 #include "absl/types/optional.h"
+#include "api/scoped_refptr.h"
 #include "api/video_codecs/sdp_video_format.h"
 #include "api/video_codecs/video_codec.h"
 #include "rtc_base/ref_count.h"
-#include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
 

audio/BUILD.gn

@@ -46,6 +46,7 @@ rtc_static_library("audio") {
     "../api:array_view",
     "../api:call_api",
     "../api:libjingle_peerconnection_api",
+    "../api:scoped_refptr",
     "../api:transport_api",
     "../api/audio:aec3_factory",
     "../api/audio:audio_frame_api",

audio/audio_transport_impl.h

@@ -14,6 +14,7 @@
 #include <vector>
 
 #include "api/audio/audio_mixer.h"
+#include "api/scoped_refptr.h"
 #include "audio/audio_level.h"
 #include "common_audio/resampler/include/push_resampler.h"
 #include "modules/audio_device/include/audio_device.h"
@@ -21,7 +22,6 @@
 #include "modules/audio_processing/typing_detection.h"
 #include "rtc_base/constructor_magic.h"
 #include "rtc_base/critical_section.h"
-#include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/thread_annotations.h"
 
 namespace webrtc {

call/BUILD.gn

@@ -33,6 +33,7 @@ rtc_source_set("call_interfaces") {
     "..:webrtc_common",
     "../api:fec_controller_api",
     "../api:libjingle_peerconnection_api",
+    "../api:scoped_refptr",
     "../api:transport_api",
     "../api/audio:audio_mixer_api",
     "../api/audio_codecs:audio_codecs_api",

call/audio_receive_stream.h

@@ -23,8 +23,8 @@
 #include "api/media_transport_interface.h"
 #include "api/rtp_parameters.h"
 #include "api/rtp_receiver_interface.h"
+#include "api/scoped_refptr.h"
 #include "call/rtp_config.h"
-#include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
 class AudioSinkInterface;

call/audio_send_stream.h

@@ -25,9 +25,9 @@
 #include "api/crypto/frame_encryptor_interface.h"
 #include "api/media_transport_interface.h"
 #include "api/rtp_parameters.h"
+#include "api/scoped_refptr.h"
 #include "call/rtp_config.h"
 #include "modules/audio_processing/include/audio_processing_statistics.h"
-#include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
 

call/audio_state.h

@@ -11,10 +11,10 @@
 #define CALL_AUDIO_STATE_H_
 
 #include "api/audio/audio_mixer.h"
+#include "api/scoped_refptr.h"
 #include "modules/audio_device/include/audio_device.h"
 #include "modules/audio_processing/include/audio_processing.h"
 #include "rtc_base/ref_count.h"
-#include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
 

common_video/BUILD.gn

@@ -40,6 +40,7 @@ rtc_static_library("common_video") {
 
   deps = [
     "..:webrtc_common",
+    "../api:scoped_refptr",
     "../api/video:encoded_image",
     "../api/video:video_bitrate_allocation",
     "../api/video:video_bitrate_allocator",
@@ -87,6 +88,7 @@ if (rtc_include_tests) {
     deps = [
       ":common_video",
       "../:webrtc_common",
+      "../api:scoped_refptr",
       "../api/units:time_delta",
       "../api/video:video_frame",
       "../api/video:video_frame_i010",

common_video/i420_buffer_pool_unittest.cc

@@ -11,10 +11,10 @@
 #include <stdint.h>
 #include <string.h>
 
+#include "api/scoped_refptr.h"
 #include "api/video/i420_buffer.h"
 #include "api/video/video_frame_buffer.h"
 #include "common_video/include/i420_buffer_pool.h"
-#include "rtc_base/scoped_ref_ptr.h"
 #include "test/gtest.h"
 
 namespace webrtc {

common_video/include/i420_buffer_pool.h

@@ -14,10 +14,10 @@
 #include <stddef.h>
 #include <list>
 
+#include "api/scoped_refptr.h"
 #include "api/video/i420_buffer.h"
 #include "rtc_base/race_checker.h"
 #include "rtc_base/ref_counted_object.h"
-#include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
 

common_video/include/video_frame_buffer.h

@@ -13,10 +13,10 @@
 
 #include <stdint.h>
 
+#include "api/scoped_refptr.h"
 #include "api/video/video_frame_buffer.h"
 #include "rtc_base/callback.h"
 #include "rtc_base/ref_counted_object.h"
-#include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
 

common_video/libyuv/include/webrtc_libyuv.h

@@ -19,10 +19,10 @@
 #include <stdio.h>
 #include <vector>
 
+#include "api/scoped_refptr.h"
 #include "api/video/video_frame.h"
 #include "api/video/video_frame_buffer.h"
 #include "common_types.h"  // NOLINT(build/include)
-#include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
 

examples/BUILD.gn

@@ -504,6 +504,7 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
 
       deps = [
         "../api:libjingle_peerconnection_api",
+        "../api:scoped_refptr",
         "../api/audio_codecs:builtin_audio_decoder_factory",
         "../api/audio_codecs:builtin_audio_encoder_factory",
         "../api/video:builtin_video_bitrate_allocator_factory",
@@ -692,6 +693,7 @@ if (is_linux || is_win) {
       "../api:audio_options_api",
       "../api:create_peerconnection_factory",
       "../api:libjingle_peerconnection_api",
+      "../api:scoped_refptr",
       "../api/audio:audio_mixer_api",
       "../api/audio_codecs:audio_codecs_api",
       "../api/video:video_frame_i420",

examples/androidnativeapi/BUILD.gn

@@ -48,6 +48,7 @@ if (is_android) {
 
     deps = [
       ":generated_jni",
+      "../../api:scoped_refptr",
       "//api:libjingle_peerconnection_api",
       "//api/audio_codecs:builtin_audio_decoder_factory",
       "//api/audio_codecs:builtin_audio_encoder_factory",

examples/androidnativeapi/jni/android_call_client.h

@@ -17,8 +17,8 @@
 #include <string>
 
 #include "api/peer_connection_interface.h"
+#include "api/scoped_refptr.h"
 #include "rtc_base/critical_section.h"
-#include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/thread_checker.h"
 #include "sdk/android/native_api/jni/scoped_java_ref.h"
 #include "sdk/android/native_api/video/video_source.h"

examples/objcnativeapi/objc/objc_call_client.h

@@ -15,8 +15,8 @@
 #include <string>
 
 #include "api/peer_connection_interface.h"
+#include "api/scoped_refptr.h"
 #include "rtc_base/critical_section.h"
-#include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/thread_checker.h"
 
 @class RTCVideoCapturer;

examples/peerconnection/client/linux/main.cc

@@ -12,6 +12,7 @@
 #include <gtk/gtk.h>
 #include <stdio.h>
 
+#include "api/scoped_refptr.h"
 #include "examples/peerconnection/client/conductor.h"
 #include "examples/peerconnection/client/flag_defs.h"
 #include "examples/peerconnection/client/linux/main_wnd.h"
@@ -20,7 +21,6 @@
 #include "rtc_base/message_queue.h"
 #include "rtc_base/physical_socket_server.h"
 #include "rtc_base/ref_counted_object.h"
-#include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/ssl_adapter.h"
 #include "rtc_base/thread.h"
 #include "system_wrappers/include/field_trial.h"

examples/peerconnection/client/linux/main_wnd.h

@@ -16,11 +16,11 @@
 #include <string>
 
 #include "api/media_stream_interface.h"
+#include "api/scoped_refptr.h"
 #include "api/video/video_frame.h"
 #include "api/video/video_sink_interface.h"
 #include "examples/peerconnection/client/main_wnd.h"
 #include "examples/peerconnection/client/peer_connection_client.h"
-#include "rtc_base/scoped_ref_ptr.h"
 
 // Forward declarations.
 typedef struct _GtkWidget GtkWidget;

logging/BUILD.gn

@@ -39,7 +39,7 @@ rtc_source_set("rtc_event_log_api") {
 
   deps = [
     "../api:libjingle_logging_api",
-    "../rtc_base:ptr_util",
+    "../api:scoped_refptr",
     "../rtc_base:rtc_base_approved",
     "//third_party/abseil-cpp/absl/memory",
   ]
@@ -65,7 +65,7 @@ rtc_source_set("rtc_event_pacing") {
 
   deps = [
     ":rtc_event_log_api",
-    "../rtc_base:ptr_util",
+    "../api:scoped_refptr",
     "//third_party/abseil-cpp/absl/memory",
   ]
 }
@@ -85,9 +85,9 @@ rtc_source_set("rtc_event_audio") {
   deps = [
     ":rtc_event_log_api",
     ":rtc_stream_config",
+    "../api:scoped_refptr",
     "../modules/audio_coding:audio_network_adaptor_config",
     "../rtc_base:checks",
-    "../rtc_base:ptr_util",
     "//third_party/abseil-cpp/absl/memory",
   ]
 }
@@ -108,8 +108,8 @@ rtc_source_set("rtc_event_bwe") {
 
   deps = [
     ":rtc_event_log_api",
+    "../api:scoped_refptr",
     "../modules/remote_bitrate_estimator:remote_bitrate_estimator",
-    "../rtc_base:ptr_util",
     "//third_party/abseil-cpp/absl/memory",
   ]
 }
@@ -129,9 +129,9 @@ rtc_source_set("rtc_event_rtp_rtcp") {
   deps = [
     ":rtc_event_log_api",
     "../api:array_view",
+    "../api:scoped_refptr",
     "../modules/rtp_rtcp:rtp_rtcp_format",
     "../rtc_base:checks",
-    "../rtc_base:ptr_util",
     "../rtc_base:rtc_base_approved",
     "//third_party/abseil-cpp/absl/memory",
   ]
@@ -148,8 +148,8 @@ rtc_source_set("rtc_event_video") {
   deps = [
     ":rtc_event_log_api",
     ":rtc_stream_config",
+    "../api:scoped_refptr",
     "../rtc_base:checks",
-    "../rtc_base:ptr_util",
     "//third_party/abseil-cpp/absl/memory",
   ]
 }

media/BUILD.gn

@@ -78,6 +78,7 @@ rtc_static_library("rtc_media_base") {
   deps = [
     "../api:array_view",
     "../api:audio_options_api",
+    "../api:scoped_refptr",
     "../rtc_base:checks",
     "../rtc_base:rtc_base_approved",
     "../rtc_base:rtc_task_queue",
@@ -190,6 +191,7 @@ rtc_static_library("rtc_simulcast_encoder_adapter") {
     "engine/simulcast_encoder_adapter.h",
   ]
   deps = [
+    "../api:scoped_refptr",
     "../api/video:video_codec_constants",
     "../api/video:video_frame",
     "../api/video:video_frame_i420",
@@ -302,6 +304,7 @@ rtc_static_library("rtc_audio_video") {
   defines = []
   libs = []
   deps = [
+    "../api:scoped_refptr",
     "../api/video:video_bitrate_allocation",
     "../api/video:video_bitrate_allocator_factory",
     "../modules/audio_processing:api",
@@ -460,6 +463,7 @@ if (rtc_include_tests) {
       ":rtc_audio_video",
       ":rtc_simulcast_encoder_adapter",
       "../api:libjingle_peerconnection_api",
+      "../api:scoped_refptr",
       "../api/video:encoded_image",
       "../api/video:video_frame_i420",
       "../call:video_stream_api",
@@ -564,6 +568,7 @@ if (rtc_include_tests) {
       ":rtc_constants",
       ":rtc_data",
       "../:webrtc_common",
+      "../api:scoped_refptr",
       "../api/test/video:function_video_factory",
       "../api/units:time_delta",
       "../api/video:video_frame_i420",

media/base/adapted_video_track_source.cc

@@ -10,11 +10,11 @@
 
 #include "media/base/adapted_video_track_source.h"
 
+#include "api/scoped_refptr.h"
 #include "api/video/i420_buffer.h"
 #include "api/video/video_frame_buffer.h"
 #include "api/video/video_rotation.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/time_utils.h"
 
 namespace rtc {

media/base/fake_frame_source.cc

@@ -10,10 +10,10 @@
 
 #include "media/base/fake_frame_source.h"
 
+#include "api/scoped_refptr.h"
 #include "api/video/i420_buffer.h"
 #include "api/video/video_frame_buffer.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/time_utils.h"
 
 namespace cricket {

media/base/fake_video_capturer.cc

@@ -14,11 +14,11 @@
 #include <cstdint>
 
 #include "absl/memory/memory.h"
+#include "api/scoped_refptr.h"
 #include "api/video/i420_buffer.h"
 #include "api/video/video_frame_buffer.h"
 #include "rtc_base/arraysize.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/time_utils.h"
 
 namespace cricket {

media/base/fake_video_renderer.h

@@ -13,12 +13,12 @@
 
 #include <stdint.h>
 
+#include "api/scoped_refptr.h"
 #include "api/video/video_frame.h"
 #include "api/video/video_frame_buffer.h"
 #include "api/video/video_rotation.h"
 #include "api/video/video_sink_interface.h"
 #include "rtc_base/critical_section.h"
-#include "rtc_base/scoped_ref_ptr.h"
 
 namespace cricket {
 

media/base/video_broadcaster.h

@@ -11,11 +11,11 @@
 #ifndef MEDIA_BASE_VIDEO_BROADCASTER_H_
 #define MEDIA_BASE_VIDEO_BROADCASTER_H_
 
+#include "api/scoped_refptr.h"
 #include "api/video/video_frame_buffer.h"
 #include "api/video/video_source_interface.h"
 #include "media/base/video_source_base.h"
 #include "rtc_base/critical_section.h"
-#include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/thread_annotations.h"
 #include "rtc_base/thread_checker.h"
 

media/base/video_capturer.cc

@@ -14,13 +14,13 @@
 
 #include <cstdint>
 
+#include "api/scoped_refptr.h"
 #include "api/video/i420_buffer.h"
 #include "api/video/video_frame.h"
 #include "api/video/video_frame_buffer.h"
 #include "api/video/video_rotation.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/time_utils.h"
 
 namespace cricket {

media/engine/apm_helpers_unittest.cc

@@ -10,8 +10,8 @@
 
 #include "media/engine/apm_helpers.h"
 
+#include "api/scoped_refptr.h"
 #include "modules/audio_processing/include/audio_processing.h"
-#include "rtc_base/scoped_ref_ptr.h"
 #include "test/gmock.h"
 #include "test/gtest.h"
 

media/engine/simulcast_encoder_adapter.cc

@@ -17,6 +17,7 @@
 #include <string>
 #include <utility>
 
+#include "api/scoped_refptr.h"
 #include "api/video/i420_buffer.h"
 #include "api/video/video_codec_constants.h"
 #include "api/video/video_frame_buffer.h"
@@ -26,7 +27,6 @@
 #include "modules/video_coding/utility/simulcast_rate_allocator.h"
 #include "rtc_base/atomic_ops.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/scoped_ref_ptr.h"
 #include "system_wrappers/include/field_trial.h"
 #include "third_party/libyuv/include/libyuv/scale.h"
 

media/engine/webrtc_voice_engine.h

@@ -18,6 +18,7 @@
 
 #include "api/audio_codecs/audio_encoder_factory.h"
 #include "api/rtp_receiver_interface.h"
+#include "api/scoped_refptr.h"
 #include "call/audio_state.h"
 #include "call/call.h"
 #include "media/base/rtp_utils.h"
@@ -28,7 +29,6 @@
 #include "rtc_base/constructor_magic.h"
 #include "rtc_base/experiments/audio_allocation_settings.h"
 #include "rtc_base/network_route.h"
-#include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/task_queue.h"
 #include "rtc_base/thread_checker.h"
 

media/engine/webrtc_voice_engine_unittest.cc

@@ -15,6 +15,7 @@
 #include "api/audio_codecs/builtin_audio_decoder_factory.h"
 #include "api/audio_codecs/builtin_audio_encoder_factory.h"
 #include "api/rtp_parameters.h"
+#include "api/scoped_refptr.h"
 #include "call/call.h"
 #include "logging/rtc_event_log/rtc_event_log.h"
 #include "media/base/fake_media_engine.h"
@@ -29,7 +30,6 @@
 #include "rtc_base/arraysize.h"
 #include "rtc_base/byte_order.h"
 #include "rtc_base/numerics/safe_conversions.h"
-#include "rtc_base/scoped_ref_ptr.h"
 #include "test/field_trial.h"
 #include "test/gtest.h"
 #include "test/mock_audio_decoder_factory.h"

modules/audio_coding/BUILD.gn

@@ -391,6 +391,7 @@ rtc_static_library("isac_common") {
   deps = [
     ":isac_bwinfo",
     "../..:webrtc_common",
+    "../../api:scoped_refptr",
     "../../api/audio_codecs:audio_codecs_api",
     "../../rtc_base:checks",
     "../../rtc_base:rtc_base_approved",
@@ -984,6 +985,7 @@ rtc_static_library("neteq") {
     "../..:webrtc_common",
     "../../api:array_view",
     "../../api:libjingle_peerconnection_api",
+    "../../api:scoped_refptr",
     "../../api/audio:audio_frame_api",
     "../../api/audio_codecs:audio_codecs_api",
     "../../common_audio",
@@ -1364,6 +1366,7 @@ if (rtc_include_tests) {
     defines = audio_coding_defines
 
     deps = audio_coding_deps + [
+             "../../api:scoped_refptr",
              "..:module_api",
              ":audio_coding",
              "../../api/audio_codecs:audio_codecs_api",

modules/audio_coding/acm2/acm_receive_test.h

@@ -16,8 +16,8 @@
 #include <string>
 
 #include "api/audio_codecs/audio_decoder_factory.h"
+#include "api/scoped_refptr.h"
 #include "rtc_base/constructor_magic.h"
-#include "rtc_base/scoped_ref_ptr.h"
 #include "system_wrappers/include/clock.h"
 
 namespace webrtc {

modules/audio_coding/codecs/isac/audio_decoder_isac_t.h

@@ -15,9 +15,9 @@
 
 #include "absl/types/optional.h"
 #include "api/audio_codecs/audio_decoder.h"
+#include "api/scoped_refptr.h"
 #include "modules/audio_coding/codecs/isac/locked_bandwidth_info.h"
 #include "rtc_base/constructor_magic.h"
-#include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
 

modules/audio_coding/codecs/isac/audio_encoder_isac_t.h

@@ -14,9 +14,9 @@
 #include <vector>
 
 #include "api/audio_codecs/audio_encoder.h"
+#include "api/scoped_refptr.h"
 #include "modules/audio_coding/codecs/isac/locked_bandwidth_info.h"
 #include "rtc_base/constructor_magic.h"
-#include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
 

modules/audio_coding/neteq/decoder_database.h

@@ -17,10 +17,10 @@
 
 #include "api/audio_codecs/audio_decoder_factory.h"
 #include "api/audio_codecs/audio_format.h"
+#include "api/scoped_refptr.h"
 #include "modules/audio_coding/codecs/cng/webrtc_cng.h"
 #include "modules/audio_coding/neteq/packet.h"
 #include "rtc_base/constructor_magic.h"
-#include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
 

modules/audio_coding/neteq/include/neteq.h

@@ -22,9 +22,9 @@
 #include "api/audio_codecs/audio_decoder.h"
 #include "api/audio_codecs/audio_format.h"
 #include "api/rtp_headers.h"
+#include "api/scoped_refptr.h"
 #include "modules/audio_coding/neteq/defines.h"
 #include "rtc_base/constructor_magic.h"
-#include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
 

modules/audio_device/BUILD.gn

@@ -98,6 +98,7 @@ rtc_source_set("audio_device_api") {
     "include/audio_device_defines.h",
   ]
   deps = [
+    "../../api:scoped_refptr",
     "../../rtc_base:checks",
     "../../rtc_base:deprecation",
     "../../rtc_base:rtc_base_approved",
@@ -198,6 +199,7 @@ rtc_source_set("audio_device_module_from_input_and_output") {
       ":audio_device_api",
       ":audio_device_buffer",
       ":windows_core_audio_utility",
+      "../../api:scoped_refptr",
       "../../rtc_base:checks",
       "../../rtc_base:rtc_base_approved",
       "//third_party/abseil-cpp/absl/memory",
@@ -216,6 +218,7 @@ rtc_source_set("audio_device_impl") {
     ":audio_device_default",
     ":audio_device_generic",
     "../../api:array_view",
+    "../../api:scoped_refptr",
     "../../common_audio",
     "../../common_audio:common_audio_c",
     "../../rtc_base:checks",
@@ -424,6 +427,7 @@ if (rtc_include_tests) {
         ":audio_device_impl",
         ":audio_device_ios_objc",
         ":mock_audio_device",
+        "../../api:scoped_refptr",
         "../../rtc_base:rtc_base_approved",
         "../../sdk:audio_objc",
         "../../system_wrappers",
@@ -451,6 +455,7 @@ if (rtc_include_tests) {
       ":audio_device_impl",
       ":mock_audio_device",
       "../../api:array_view",
+      "../../api:scoped_refptr",
       "../../common_audio",
       "../../rtc_base:checks",
       "../../rtc_base:rtc_base_approved",

modules/audio_device/android/audio_device_unittest.cc

@@ -16,6 +16,7 @@
 #include <string>
 #include <vector>
 
+#include "api/scoped_refptr.h"
 #include "modules/audio_device/android/audio_common.h"
 #include "modules/audio_device/android/audio_manager.h"
 #include "modules/audio_device/android/build_info.h"
@@ -27,7 +28,6 @@
 #include "rtc_base/critical_section.h"
 #include "rtc_base/event.h"
 #include "rtc_base/format_macros.h"
-#include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/time_utils.h"
 #include "test/gmock.h"
 #include "test/gtest.h"

modules/audio_device/audio_device_impl.cc

@@ -12,12 +12,12 @@
 
 #include <stddef.h>
 
+#include "api/scoped_refptr.h"
 #include "modules/audio_device/audio_device_config.h"  // IWYU pragma: keep
 #include "modules/audio_device/audio_device_generic.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/ref_counted_object.h"
-#include "rtc_base/scoped_ref_ptr.h"
 #include "system_wrappers/include/metrics.h"
 
 #if defined(_WIN32)

modules/audio_device/audio_device_unittest.cc

@@ -16,6 +16,7 @@
 #include "absl/memory/memory.h"
 #include "absl/types/optional.h"
 #include "api/array_view.h"
+#include "api/scoped_refptr.h"
 #include "modules/audio_device/audio_device_impl.h"
 #include "modules/audio_device/include/audio_device.h"
 #include "modules/audio_device/include/mock_audio_transport.h"
@@ -25,7 +26,6 @@
 #include "rtc_base/logging.h"
 #include "rtc_base/numerics/safe_conversions.h"
 #include "rtc_base/race_checker.h"
-#include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/thread_annotations.h"
 #include "rtc_base/thread_checker.h"
 #include "rtc_base/time_utils.h"

modules/audio_device/include/audio_device.h

@@ -11,9 +11,9 @@
 #ifndef MODULES_AUDIO_DEVICE_INCLUDE_AUDIO_DEVICE_H_
 #define MODULES_AUDIO_DEVICE_INCLUDE_AUDIO_DEVICE_H_
 
+#include "api/scoped_refptr.h"
 #include "modules/audio_device/include/audio_device_defines.h"
 #include "rtc_base/ref_count.h"
-#include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
 

modules/audio_device/include/audio_device_data_observer.h

@@ -14,8 +14,8 @@
 #include <stddef.h>
 #include <stdint.h>
 
+#include "api/scoped_refptr.h"
 #include "modules/audio_device/include/audio_device.h"
-#include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
 

modules/audio_device/include/test_audio_device.h

@@ -16,12 +16,12 @@
 #include <string>
 
 #include "api/array_view.h"
+#include "api/scoped_refptr.h"
 #include "modules/audio_device/include/audio_device.h"
 #include "modules/audio_device/include/audio_device_defines.h"
 #include "rtc_base/buffer.h"
 #include "rtc_base/event.h"
 #include "rtc_base/platform_file.h"
-#include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
 

modules/audio_device/ios/audio_device_unittest_ios.mm

@@ -16,6 +16,7 @@
 #include <string>
 #include <vector>
 
+#include "api/scoped_refptr.h"
 #include "modules/audio_device/audio_device_impl.h"
 #include "modules/audio_device/include/audio_device.h"
 #include "modules/audio_device/include/mock_audio_transport.h"
@@ -25,7 +26,6 @@
 #include "rtc_base/event.h"
 #include "rtc_base/format_macros.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/time_utils.h"
 #include "test/gmock.h"
 #include "test/gtest.h"

modules/audio_device/win/audio_device_core_win.h

@@ -26,8 +26,8 @@
 #include <mediaobj.h>     // IMediaObject
 #include <mmdeviceapi.h>  // MMDevice
 
+#include "api/scoped_refptr.h"
 #include "rtc_base/critical_section.h"
-#include "rtc_base/scoped_ref_ptr.h"
 
 // Use Multimedia Class Scheduler Service (MMCSS) to boost the thread priority
 #pragma comment(lib, "avrt.lib")

modules/audio_device/win/audio_device_module_win.h

@@ -14,8 +14,8 @@
 #include <memory>
 #include <string>
 
+#include "api/scoped_refptr.h"
 #include "modules/audio_device/include/audio_device.h"
-#include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
 

modules/audio_mixer/BUILD.gn

@@ -38,6 +38,7 @@ rtc_static_library("audio_mixer_impl") {
   deps = [
     ":audio_frame_manipulator",
     "../../api:array_view",
+    "../../api:scoped_refptr",
     "../../api/audio:audio_frame_api",
     "../../api/audio:audio_mixer_api",
     "../../audio/utility:audio_frame_operations",

modules/audio_mixer/audio_mixer_impl.h

@@ -17,12 +17,12 @@
 
 #include "api/audio/audio_frame.h"
 #include "api/audio/audio_mixer.h"
+#include "api/scoped_refptr.h"
 #include "modules/audio_mixer/frame_combiner.h"
 #include "modules/audio_mixer/output_rate_calculator.h"
 #include "rtc_base/constructor_magic.h"
 #include "rtc_base/critical_section.h"
 #include "rtc_base/race_checker.h"
-#include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/thread_annotations.h"
 
 namespace webrtc {

modules/audio_processing/BUILD.gn

@@ -50,11 +50,11 @@ rtc_source_set("api") {
     ":audio_processing_statistics",
     ":config",
     ":gain_control_interface",
+    "../../api:scoped_refptr",
     "../../api/audio:aec3_config",
     "../../api/audio:echo_control",
     "../../rtc_base:deprecation",
     "../../rtc_base:macromagic",
-    "../../rtc_base:ptr_util",
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base/system:rtc_export",
     "//third_party/abseil-cpp/absl/types:optional",
@@ -416,6 +416,7 @@ if (rtc_include_tests) {
       ":mocks",
       "../..:webrtc_common",
       "../../api:array_view",
+      "../../api:scoped_refptr",
       "../../api/audio:aec3_config",
       "../../api/audio:aec3_factory",
       "../../common_audio:common_audio",

modules/audio_processing/agc2/rnn_vad/BUILD.gn

@@ -52,8 +52,8 @@ if (rtc_include_tests) {
     ]
     deps = [
       "../../../../api:array_view",
+      "../../../../api:scoped_refptr",
       "../../../../rtc_base:checks",
-      "../../../../rtc_base:ptr_util",
       "../../../../test:fileutils",
       "../../../../test:test_support",
       "//third_party/abseil-cpp/absl/memory",

modules/audio_processing/audio_processing_impl_unittest.cc

@@ -13,12 +13,12 @@
 #include <memory>
 
 #include "absl/memory/memory.h"
+#include "api/scoped_refptr.h"
 #include "modules/audio_processing/include/audio_processing.h"
 #include "modules/audio_processing/test/echo_control_mock.h"
 #include "modules/audio_processing/test/test_utils.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/ref_counted_object.h"
-#include "rtc_base/scoped_ref_ptr.h"
 #include "test/gmock.h"
 #include "test/gtest.h"
 

modules/audio_processing/include/audio_processing.h

@@ -25,6 +25,7 @@
 #include "absl/types/optional.h"
 #include "api/audio/echo_canceller3_config.h"
 #include "api/audio/echo_control.h"
+#include "api/scoped_refptr.h"
 #include "modules/audio_processing/include/audio_generator.h"
 #include "modules/audio_processing/include/audio_processing_statistics.h"
 #include "modules/audio_processing/include/config.h"
@@ -33,7 +34,6 @@
 #include "rtc_base/deprecation.h"
 #include "rtc_base/platform_file.h"
 #include "rtc_base/ref_count.h"
-#include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/system/rtc_export.h"
 
 namespace webrtc {

modules/congestion_controller/BUILD.gn

@@ -37,6 +37,7 @@ rtc_static_library("congestion_controller") {
     ":transport_feedback",
     "..:module_api",
     "../..:webrtc_common",
+    "../../api:scoped_refptr",
     "../../api/transport:field_trial_based_config",
     "../../api/transport:network_control",
     "../../api/transport:webrtc_key_value_config",
@@ -44,7 +45,6 @@ rtc_static_library("congestion_controller") {
     "../../api/units:timestamp",
     "../../rtc_base:checks",
     "../../rtc_base:deprecation",
-    "../../rtc_base:ptr_util",
     "../../rtc_base:rate_limiter",
     "../../rtc_base/experiments:rate_control_settings",
     "../../rtc_base/network:sent_packet",

modules/desktop_capture/BUILD.gn

@@ -30,6 +30,7 @@ rtc_static_library("primitives") {
   ]
 
   deps = [
+    "../../api:scoped_refptr",
     "../../rtc_base:checks",
     "../../rtc_base/system:rtc_export",
     "//third_party/abseil-cpp/absl/memory",
@@ -46,6 +47,7 @@ if (rtc_include_tests) {
 
     sources = []
     deps = [
+      "../../api:scoped_refptr",
       "../../rtc_base:checks",
       "//third_party/abseil-cpp/absl/memory",
     ]
@@ -131,6 +133,7 @@ if (rtc_include_tests) {
 
     deps = [
       ":primitives",
+      "../../api:scoped_refptr",
       "../../rtc_base:checks",
       "../../rtc_base:rtc_base_approved",
       "../../system_wrappers",
@@ -236,6 +239,7 @@ if (is_mac) {
     deps = [
       ":desktop_capture_generic",
       ":primitives",
+      "../../api:scoped_refptr",
       "../../rtc_base:checks",
       "../../rtc_base:rtc_base",
       "../../rtc_base:rtc_base_approved",
@@ -425,6 +429,7 @@ rtc_static_library("desktop_capture_generic") {
   deps = [
     ":primitives",
     "../../api:refcountedbase",
+    "../../api:scoped_refptr",
     "../../rtc_base:checks",
     "../../rtc_base:rtc_base",  # TODO(kjellander): Cleanup in bugs.webrtc.org/3806.
     "../../rtc_base/synchronization:rw_lock_wrapper",

modules/desktop_capture/desktop_capture_options.h

@@ -10,7 +10,7 @@
 #ifndef MODULES_DESKTOP_CAPTURE_DESKTOP_CAPTURE_OPTIONS_H_
 #define MODULES_DESKTOP_CAPTURE_DESKTOP_CAPTURE_OPTIONS_H_
 
-#include "rtc_base/scoped_ref_ptr.h"
+#include "api/scoped_refptr.h"
 #include "rtc_base/system/rtc_export.h"
 
 #if defined(USE_X11)

modules/desktop_capture/linux/mouse_cursor_monitor_x11.h

@@ -14,12 +14,12 @@
 #include <X11/X.h>
 #include <memory>
 
+#include "api/scoped_refptr.h"
 #include "modules/desktop_capture/desktop_capture_options.h"
 #include "modules/desktop_capture/desktop_capture_types.h"
 #include "modules/desktop_capture/linux/shared_x_display.h"
 #include "modules/desktop_capture/mouse_cursor.h"
 #include "modules/desktop_capture/mouse_cursor_monitor.h"
-#include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
 

modules/desktop_capture/linux/shared_x_display.h

@@ -17,8 +17,8 @@
 #include <string>
 
 #include "api/ref_counted_base.h"
+#include "api/scoped_refptr.h"
 #include "rtc_base/constructor_magic.h"
-#include "rtc_base/scoped_ref_ptr.h"
 
 // Including Xlib.h will involve evil defines (Bool, Status, True, False), which
 // easily conflict with other headers.

modules/desktop_capture/linux/window_capturer_x11.cc

@@ -18,6 +18,7 @@
 #include <string>
 #include <utility>
 
+#include "api/scoped_refptr.h"
 #include "modules/desktop_capture/desktop_capture_types.h"
 #include "modules/desktop_capture/desktop_frame.h"
 #include "modules/desktop_capture/desktop_region.h"
@@ -26,7 +27,6 @@
 #include "modules/desktop_capture/linux/window_list_utils.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/trace_event.h"
 
 namespace webrtc {

modules/desktop_capture/linux/window_capturer_x11.h

@@ -16,6 +16,7 @@
 #include <memory>
 #include <string>
 
+#include "api/scoped_refptr.h"
 #include "modules/desktop_capture/desktop_capture_options.h"
 #include "modules/desktop_capture/desktop_capturer.h"
 #include "modules/desktop_capture/desktop_geometry.h"
@@ -24,7 +25,6 @@
 #include "modules/desktop_capture/linux/x_atom_cache.h"
 #include "modules/desktop_capture/linux/x_server_pixel_buffer.h"
 #include "rtc_base/constructor_magic.h"
-#include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
 

modules/desktop_capture/mouse_cursor_monitor_mac.mm

@@ -18,6 +18,7 @@
 #include <Cocoa/Cocoa.h>
 #include <CoreFoundation/CoreFoundation.h>
 
+#include "api/scoped_refptr.h"
 #include "modules/desktop_capture/desktop_capture_options.h"
 #include "modules/desktop_capture/desktop_capture_types.h"
 #include "modules/desktop_capture/desktop_frame.h"
@@ -27,7 +28,6 @@
 #include "modules/desktop_capture/mac/window_list_utils.h"
 #include "modules/desktop_capture/mouse_cursor.h"
 #include "rtc_base/mac_utils.h"
-#include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
 

modules/desktop_capture/screen_drawer_linux.cc

@@ -14,6 +14,7 @@
 #include <memory>
 
 #include "absl/memory/memory.h"
+#include "api/scoped_refptr.h"
 #include "modules/desktop_capture/desktop_capture_types.h"
 #include "modules/desktop_capture/desktop_geometry.h"
 #include "modules/desktop_capture/linux/shared_x_display.h"
@@ -21,7 +22,6 @@
 #include "modules/desktop_capture/screen_drawer.h"
 #include "modules/desktop_capture/screen_drawer_lock_posix.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/scoped_ref_ptr.h"
 #include "system_wrappers/include/sleep.h"
 
 namespace webrtc {

modules/desktop_capture/shared_desktop_frame.h

@@ -13,10 +13,10 @@
 
 #include <memory>
 
+#include "api/scoped_refptr.h"
 #include "modules/desktop_capture/desktop_frame.h"
 #include "rtc_base/constructor_magic.h"
 #include "rtc_base/ref_counted_object.h"
-#include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/system/rtc_export.h"
 
 namespace webrtc {

modules/desktop_capture/win/dxgi_duplicator_controller.h

@@ -17,6 +17,7 @@
 #include <string>
 #include <vector>
 
+#include "api/scoped_refptr.h"
 #include "modules/desktop_capture/desktop_geometry.h"
 #include "modules/desktop_capture/shared_desktop_frame.h"
 #include "modules/desktop_capture/win/d3d_device.h"
@@ -25,7 +26,6 @@
 #include "modules/desktop_capture/win/dxgi_context.h"
 #include "modules/desktop_capture/win/dxgi_frame.h"
 #include "rtc_base/critical_section.h"
-#include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
 

modules/desktop_capture/win/screen_capturer_win_directx.h

@@ -16,13 +16,13 @@
 #include <memory>
 #include <vector>
 
+#include "api/scoped_refptr.h"
 #include "modules/desktop_capture/desktop_capture_options.h"
 #include "modules/desktop_capture/desktop_capturer.h"
 #include "modules/desktop_capture/desktop_region.h"
 #include "modules/desktop_capture/screen_capture_frame_queue.h"
 #include "modules/desktop_capture/win/dxgi_duplicator_controller.h"
 #include "modules/desktop_capture/win/dxgi_frame.h"
-#include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
 

modules/desktop_capture/window_capturer_mac.mm

@@ -15,6 +15,7 @@
 
 #include <utility>
 
+#include "api/scoped_refptr.h"
 #include "modules/desktop_capture/desktop_capture_options.h"
 #include "modules/desktop_capture/desktop_capturer.h"
 #include "modules/desktop_capture/desktop_frame.h"
@@ -26,7 +27,6 @@
 #include "rtc_base/constructor_magic.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/mac_utils.h"
-#include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/trace_event.h"
 
 namespace webrtc {

modules/desktop_capture/window_finder.h

@@ -13,9 +13,9 @@
 
 #include <memory>
 
+#include "api/scoped_refptr.h"
 #include "modules/desktop_capture/desktop_capture_types.h"
 #include "modules/desktop_capture/desktop_geometry.h"
-#include "rtc_base/scoped_ref_ptr.h"
 
 #if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
 #include "modules/desktop_capture/mac/desktop_configuration_monitor.h"

modules/desktop_capture/window_finder_mac.h

@@ -11,8 +11,8 @@
 #ifndef MODULES_DESKTOP_CAPTURE_WINDOW_FINDER_MAC_H_
 #define MODULES_DESKTOP_CAPTURE_WINDOW_FINDER_MAC_H_
 
+#include "api/scoped_refptr.h"
 #include "modules/desktop_capture/window_finder.h"
-#include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
 

modules/desktop_capture/window_finder_unittest.cc

@@ -13,10 +13,10 @@
 #include <stdint.h>
 #include <memory>
 
+#include "api/scoped_refptr.h"
 #include "modules/desktop_capture/desktop_geometry.h"
 #include "modules/desktop_capture/screen_drawer.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/scoped_ref_ptr.h"
 #include "test/gtest.h"
 
 #if defined(USE_X11)

modules/rtp_rtcp/BUILD.gn

@@ -199,6 +199,7 @@ rtc_static_library("rtp_rtcp") {
     "../..:webrtc_common",
     "../../api:array_view",
     "../../api:libjingle_peerconnection_api",
+    "../../api:scoped_refptr",
     "../../api:transport_api",
     "../../api/audio_codecs:audio_codecs_api",
     "../../api/video:video_bitrate_allocation",
@@ -427,6 +428,7 @@ if (rtc_include_tests) {
       "../..:webrtc_common",
       "../../api:array_view",
       "../../api:libjingle_peerconnection_api",
+      "../../api:scoped_refptr",
       "../../api:transport_api",
       "../../api/video:video_bitrate_allocation",
       "../../api/video:video_bitrate_allocator",

modules/rtp_rtcp/source/flexfec_header_reader_writer.cc

@@ -12,11 +12,11 @@
 
 #include <string.h>
 
+#include "api/scoped_refptr.h"
 #include "modules/rtp_rtcp/source/byte_io.h"
 #include "modules/rtp_rtcp/source/forward_error_correction_internal.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
 

modules/rtp_rtcp/source/flexfec_header_reader_writer_unittest.cc

@@ -13,13 +13,13 @@
 #include <memory>
 #include <utility>
 
+#include "api/scoped_refptr.h"
 #include "modules/rtp_rtcp/source/byte_io.h"
 #include "modules/rtp_rtcp/source/flexfec_header_reader_writer.h"
 #include "modules/rtp_rtcp/source/forward_error_correction.h"
 #include "modules/rtp_rtcp/source/forward_error_correction_internal.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/random.h"
-#include "rtc_base/scoped_ref_ptr.h"
 #include "test/gmock.h"
 #include "test/gtest.h"
 

modules/rtp_rtcp/source/flexfec_receiver.cc

@@ -13,9 +13,9 @@
 #include <string.h>
 
 #include "api/array_view.h"
+#include "api/scoped_refptr.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
 

modules/rtp_rtcp/source/forward_error_correction.h

@@ -17,10 +17,10 @@
 #include <memory>
 #include <vector>
 
+#include "api/scoped_refptr.h"
 #include "modules/include/module_fec_types.h"
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "modules/rtp_rtcp/source/forward_error_correction_internal.h"
-#include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
 

modules/rtp_rtcp/source/ulpfec_header_reader_writer.cc

@@ -12,10 +12,10 @@
 
 #include <string.h>
 
+#include "api/scoped_refptr.h"
 #include "modules/rtp_rtcp/source/byte_io.h"
 #include "modules/rtp_rtcp/source/forward_error_correction_internal.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {