From 70026f9d14f000de17c2f101d6cd9c720fae48a2 Mon Sep 17 00:00:00 2001
From: Karl Wiberg <kwiberg@webrtc.org>
Date: Fri, 18 Sep 2020 10:03:16 +0200
Subject: [PATCH] Put UntypedFunction in untyped_function.h, not function.h

This will make it easier to find stuff...

Bug: webrtc:11943
Change-Id: I4f1ae80b40b4966cb2d8db36701bbc02ac148df6
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/184512
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#32137}
---
 BUILD.gn                                             |  2 +-
 rtc_base/BUILD.gn                                    | 12 ++++++------
 rtc_base/cancer_stick_castle.h                       |  2 +-
 rtc_base/{function.h => untyped_function.h}          |  6 +++---
 ...tion_unittest.cc => untyped_function_unittest.cc} |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)
 rename rtc_base/{function.h => untyped_function.h} (98%)
 rename rtc_base/{function_unittest.cc => untyped_function_unittest.cc} (99%)

diff --git a/BUILD.gn b/BUILD.gn
index 23e887a1bc..7b07ebe07d 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -539,7 +539,6 @@ if (rtc_include_tests) {
       "p2p:libstunprober_unittests",
       "p2p:rtc_p2p_unittests",
       "rtc_base:cancer_stick_castle_unittests",
-      "rtc_base:function_unittest",
       "rtc_base:rtc_base_approved_unittests",
       "rtc_base:rtc_base_unittests",
       "rtc_base:rtc_json_unittests",
@@ -547,6 +546,7 @@ if (rtc_include_tests) {
       "rtc_base:rtc_operations_chain_unittests",
       "rtc_base:rtc_task_queue_unittests",
       "rtc_base:sigslot_unittest",
+      "rtc_base:untyped_function_unittest",
       "rtc_base:weak_ptr_unittests",
       "rtc_base/experiments:experiments_unittests",
       "rtc_base/synchronization:sequence_checker_unittests",
diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
index 137d7ca923..7347e0ddd7 100644
--- a/rtc_base/BUILD.gn
+++ b/rtc_base/BUILD.gn
@@ -43,8 +43,8 @@ rtc_source_set("ignore_wundef") {
   sources = [ "ignore_wundef.h" ]
 }
 
-rtc_source_set("function") {
-  sources = [ "function.h" ]
+rtc_source_set("untyped_function") {
+  sources = [ "untyped_function.h" ]
   deps = [ "system:assume" ]
 }
 
@@ -54,7 +54,7 @@ rtc_source_set("cancer_stick_castle") {
     "cancer_stick_castle.h",
   ]
   deps = [
-    ":function",
+    ":untyped_function",
     "../api:function_view",
     "system:assume",
   ]
@@ -1171,11 +1171,11 @@ if (rtc_include_tests) {
     ]
   }
 
-  rtc_library("function_unittest") {
+  rtc_library("untyped_function_unittest") {
     testonly = true
-    sources = [ "function_unittest.cc" ]
+    sources = [ "untyped_function_unittest.cc" ]
     deps = [
-      ":function",
+      ":untyped_function",
       "../test:test_support",
     ]
   }
diff --git a/rtc_base/cancer_stick_castle.h b/rtc_base/cancer_stick_castle.h
index df142c26cb..930e289d61 100644
--- a/rtc_base/cancer_stick_castle.h
+++ b/rtc_base/cancer_stick_castle.h
@@ -15,8 +15,8 @@
 #include <vector>
 
 #include "api/function_view.h"
-#include "rtc_base/function.h"
 #include "rtc_base/system/assume.h"
+#include "rtc_base/untyped_function.h"
 
 namespace webrtc {
 namespace cancer_stick_castle_impl {
diff --git a/rtc_base/function.h b/rtc_base/untyped_function.h
similarity index 98%
rename from rtc_base/function.h
rename to rtc_base/untyped_function.h
index 005c360e9e..9220d3f9e4 100644
--- a/rtc_base/function.h
+++ b/rtc_base/untyped_function.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_FUNCTION_H_
-#define RTC_BASE_FUNCTION_H_
+#ifndef RTC_BASE_UNTYPED_FUNCTION_H_
+#define RTC_BASE_UNTYPED_FUNCTION_H_
 
 #include <memory>
 #include <type_traits>
@@ -220,4 +220,4 @@ class UntypedFunction final {
 
 }  // namespace webrtc
 
-#endif  // RTC_BASE_FUNCTION_H_
+#endif  // RTC_BASE_UNTYPED_FUNCTION_H_
diff --git a/rtc_base/function_unittest.cc b/rtc_base/untyped_function_unittest.cc
similarity index 99%
rename from rtc_base/function_unittest.cc
rename to rtc_base/untyped_function_unittest.cc
index 7a3d658917..89caf200c6 100644
--- a/rtc_base/function_unittest.cc
+++ b/rtc_base/untyped_function_unittest.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/function.h"
+#include "rtc_base/untyped_function.h"
 
 #include <memory>
 #include <vector>