From 23cecc1d43b5ec2a563bc6963abc0fb1b11423cc Mon Sep 17 00:00:00 2001
From: Harald Alvestrand <hta@webrtc.org>
Date: Thu, 2 Nov 2023 14:09:30 +0000
Subject: [PATCH] Move scoped_refptr from rtc:: to webrtc::

leaving a compatible alias.

Bug: webrtc:15622
Change-Id: Ie25d87fa372cc71eaf52882454f4dd24c7c33789
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/325462
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41072}
---
 api/scoped_refptr.h                           | 33 +++++++++++--------
 .../win/dxgi_duplicator_controller.h          |  2 +-
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/api/scoped_refptr.h b/api/scoped_refptr.h
index e145509127..61b2eb1f20 100644
--- a/api/scoped_refptr.h
+++ b/api/scoped_refptr.h
@@ -66,7 +66,7 @@
 #include <memory>
 #include <utility>
 
-namespace rtc {
+namespace webrtc {
 
 template <class T>
 class scoped_refptr {
@@ -162,61 +162,66 @@ class scoped_refptr {
 };
 
 template <typename T, typename U>
-bool operator==(const rtc::scoped_refptr<T>& a,
-                const rtc::scoped_refptr<U>& b) {
+bool operator==(const scoped_refptr<T>& a, const scoped_refptr<U>& b) {
   return a.get() == b.get();
 }
 template <typename T, typename U>
-bool operator!=(const rtc::scoped_refptr<T>& a,
-                const rtc::scoped_refptr<U>& b) {
+bool operator!=(const scoped_refptr<T>& a, const scoped_refptr<U>& b) {
   return !(a == b);
 }
 
 template <typename T>
-bool operator==(const rtc::scoped_refptr<T>& a, std::nullptr_t) {
+bool operator==(const scoped_refptr<T>& a, std::nullptr_t) {
   return a.get() == nullptr;
 }
 
 template <typename T>
-bool operator!=(const rtc::scoped_refptr<T>& a, std::nullptr_t) {
+bool operator!=(const scoped_refptr<T>& a, std::nullptr_t) {
   return !(a == nullptr);
 }
 
 template <typename T>
-bool operator==(std::nullptr_t, const rtc::scoped_refptr<T>& a) {
+bool operator==(std::nullptr_t, const scoped_refptr<T>& a) {
   return a.get() == nullptr;
 }
 
 template <typename T>
-bool operator!=(std::nullptr_t, const rtc::scoped_refptr<T>& a) {
+bool operator!=(std::nullptr_t, const scoped_refptr<T>& a) {
   return !(a == nullptr);
 }
 
 // Comparison with raw pointer.
 template <typename T, typename U>
-bool operator==(const rtc::scoped_refptr<T>& a, const U* b) {
+bool operator==(const scoped_refptr<T>& a, const U* b) {
   return a.get() == b;
 }
 template <typename T, typename U>
-bool operator!=(const rtc::scoped_refptr<T>& a, const U* b) {
+bool operator!=(const scoped_refptr<T>& a, const U* b) {
   return !(a == b);
 }
 
 template <typename T, typename U>
-bool operator==(const T* a, const rtc::scoped_refptr<U>& b) {
+bool operator==(const T* a, const scoped_refptr<U>& b) {
   return a == b.get();
 }
 template <typename T, typename U>
-bool operator!=(const T* a, const rtc::scoped_refptr<U>& b) {
+bool operator!=(const T* a, const scoped_refptr<U>& b) {
   return !(a == b);
 }
 
 // Ordered comparison, needed for use as a std::map key.
 template <typename T, typename U>
-bool operator<(const rtc::scoped_refptr<T>& a, const rtc::scoped_refptr<U>& b) {
+bool operator<(const scoped_refptr<T>& a, const scoped_refptr<U>& b) {
   return a.get() < b.get();
 }
 
+}  // namespace webrtc
+
+namespace rtc {
+// Backwards compatible alias.
+// TODO(bugs.webrtc.org/15622): Deprecate and remove.
+template <typename T>
+using scoped_refptr = webrtc::scoped_refptr<T>;
 }  // namespace rtc
 
 #endif  // API_SCOPED_REFPTR_H_
diff --git a/modules/desktop_capture/win/dxgi_duplicator_controller.h b/modules/desktop_capture/win/dxgi_duplicator_controller.h
index 2b1e0ab041..815986f680 100644
--- a/modules/desktop_capture/win/dxgi_duplicator_controller.h
+++ b/modules/desktop_capture/win/dxgi_duplicator_controller.h
@@ -132,7 +132,7 @@ class RTC_EXPORT DxgiDuplicatorController {
 
   // scoped_refptr<DxgiDuplicatorController> accesses private AddRef() and
   // Release() functions.
-  friend class rtc::scoped_refptr<DxgiDuplicatorController>;
+  friend class webrtc::scoped_refptr<DxgiDuplicatorController>;
 
   // A private constructor to ensure consumers to use
   // DxgiDuplicatorController::Instance().