[rtsan] Rename callback variable and test function

Author: davidtrevelyan

compiler-rt/lib/rtsan/rtsan_assertions.h

@@ -18,11 +18,11 @@
 namespace __rtsan {
 
 template <typename OnViolationAction>
-void ExpectNotRealtime(Context &context, OnViolationAction &&on_violation) {
+void ExpectNotRealtime(Context &context, OnViolationAction &&OnViolation) {
   CHECK(__rtsan_is_initialized());
   if (context.InRealtimeContext() && !context.IsBypassed()) {
     context.BypassPush();
-    on_violation();
+    OnViolation();
     context.BypassPop();
   }
 }

compiler-rt/lib/rtsan/tests/rtsan_test_assertions.cpp

@@ -23,7 +23,7 @@ class TestRtsanAssertions : public ::testing::Test {
   void SetUp() override { __rtsan_ensure_initialized(); }
 };
 
-static void testExpectNotRealtime(__rtsan::Context &context,
+static void ExpectViolationAction(__rtsan::Context &context,
                                   bool expect_violation_callback) {
   ::testing::MockFunction<void()> mock_on_violation;
   EXPECT_CALL(mock_on_violation, Call).Times(expect_violation_callback ? 1 : 0);
@@ -34,15 +34,15 @@ TEST_F(TestRtsanAssertions,
        ExpectNotRealtimeDoesNotCallViolationActionIfNotInRealtimeContext) {
   __rtsan::Context context{};
   ASSERT_FALSE(context.InRealtimeContext());
-  testExpectNotRealtime(context, false);
+  ExpectViolationAction(context, false);
 }
 
 TEST_F(TestRtsanAssertions,
        ExpectNotRealtimeCallsViolationActionIfInRealtimeContext) {
   __rtsan::Context context{};
   context.RealtimePush();
   ASSERT_TRUE(context.InRealtimeContext());
-  testExpectNotRealtime(context, true);
+  ExpectViolationAction(context, true);
 }
 
 TEST_F(TestRtsanAssertions,
@@ -51,5 +51,5 @@ TEST_F(TestRtsanAssertions,
   context.RealtimePush();
   context.BypassPush();
   ASSERT_TRUE(context.IsBypassed());
-  testExpectNotRealtime(context, false);
+  ExpectViolationAction(context, false);
 }