commit 5ad491ec8720a6bb746542b861a019391293d40c
author Harald Alvestrand <hta@webrtc.org> Fri Feb 10 11:28:04 2023
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Feb 10 13:10:35 2023
tree 53fcf3fe11093cfca793fe1bf72b6ab97527e847
parent eccd93e89262cd5664d4a777ed78f50f624a2553

Remove call operator from UniqueIdGenerator classes

Call operators do not improve code clarity, and usage was moderate.

Bug: None
Change-Id: I8d86bd7d435ce88e99f4abee8ab95a336d47dc22
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/292960
Reviewed-by: Tomas Gunnarsson <tommi@webrtc.org>
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#39294}

rtc_base/unique_id_generator_unittest.cc

diff --git a/rtc_base/unique_id_generator_unittest.cc b/rtc_base/unique_id_generator_unittest.cc
index c6eb511..ec9c3fb 100644
--- a/rtc_base/unique_id_generator_unittest.cc
+++ b/rtc_base/unique_id_generator_unittest.cc
@@ -62,7 +62,7 @@
   Generator generator;
   std::vector<typename Generator::value_type> values;
   for (size_t i = 0; i < num_elements; i++) {
-    values.push_back(generator());
+    values.push_back(generator.Generate());
   }
 
   EXPECT_EQ(num_elements, values.size());
@@ -78,7 +78,7 @@
   Generator generator1;
   std::vector<typename Generator::value_type> known_values;
   for (size_t i = 0; i < num_elements; i++) {
-    known_values.push_back(generator1());
+    known_values.push_back(generator1.Generate());
   }
   EXPECT_EQ(num_elements, known_values.size());
 
@@ -87,7 +87,7 @@
 
   std::vector<typename Generator::value_type> values;
   for (size_t i = 0; i < num_elements; i++) {
-    values.push_back(generator2());
+    values.push_back(generator2.Generate());
   }
   EXPECT_THAT(values, ::testing::SizeIs(num_elements));
   absl::c_sort(values);
@@ -105,7 +105,7 @@
   Generator generator1;
   std::vector<typename Generator::value_type> known_values;
   for (size_t i = 0; i < num_elements; i++) {
-    known_values.push_back(generator1());
+    known_values.push_back(generator1.Generate());
   }
   EXPECT_EQ(num_elements, known_values.size());
 
@@ -118,7 +118,7 @@
 
   std::vector<typename Generator::value_type> values;
   for (size_t i = 0; i < num_elements; i++) {
-    values.push_back(generator2());
+    values.push_back(generator2.Generate());
   }
   EXPECT_THAT(values, ::testing::SizeIs(num_elements));
   absl::c_sort(values);
@@ -134,7 +134,7 @@
 
   rtc::InitRandom(0);
   Generator generator1;
-  const typename Generator::value_type id = generator1();
+  const typename Generator::value_type id = generator1.Generate();
 
   rtc::InitRandom(0);
   Generator generator2;
@@ -146,7 +146,7 @@
 
   rtc::InitRandom(0);
   Generator generator1;
-  const typename Generator::value_type id = generator1();
+  const typename Generator::value_type id = generator1.Generate();
 
   rtc::InitRandom(0);
   Generator generator2;
@@ -160,7 +160,7 @@
 
   rtc::InitRandom(0);
   Generator generator1;
-  const typename Generator::value_type id = generator1();
+  const typename Generator::value_type id = generator1.Generate();
   std::vector<typename Generator::value_type> known_values = {id};
 
   rtc::InitRandom(0);
@@ -182,7 +182,7 @@
   ASSERT_NE(current_tq, webrtc::TaskQueueBase::Current());
 
   // Generating an id should be fine in this context.
-  generator.GenerateNumber();
+  generator.Generate();
 }
 
 #if RTC_DCHECK_IS_ON && GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
@@ -196,13 +196,13 @@
   FakeTaskQueue initial_fake_task_queue;
   // Generate an ID on the current thread. This causes the generator to attach
   // to the current thread context.
-  generator.GenerateNumber();
+  generator.Generate();
 
   // Instantiate a fake task queue that will register itself as the current tq.
   FakeTaskQueue fake_task_queue;
 
   // Attempting to generate an id should now trigger a dcheck.
-  EXPECT_DEATH(generator.GenerateNumber(), "");
+  EXPECT_DEATH(generator.Generate(), "");
 }
 #endif