Shorted "reference" to "ref".

7 years ago · bf816d325e
parent 240bad3d2d
commit bf816d325e
16 changed files with 161 additions and 162 deletions
--- a/8
+++ b/8
@ -544,8 +544,8 @@ grpc_cc_library(
 )

 grpc_cc_library(
-    name = "reference_counted",
-    public_hdrs = ["src/core/lib/support/reference_counted.h"],
+    name = "ref_counted",
+    public_hdrs = ["src/core/lib/support/ref_counted.h"],
    language = "c++",
    deps = [
        "grpc_trace",
@ -554,8 +554,8 @@ grpc_cc_library(
 )

 grpc_cc_library(
-    name = "reference_counted_ptr",
-    public_hdrs = ["src/core/lib/support/reference_counted_ptr.h"],
+    name = "ref_counted_ptr",
+    public_hdrs = ["src/core/lib/support/ref_counted_ptr.h"],
    language = "c++",
 )

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -739,8 +739,8 @@ endif()
 add_dependencies(buildtests_cxx qps_worker)
 add_dependencies(buildtests_cxx reconnect_interop_client)
 add_dependencies(buildtests_cxx reconnect_interop_server)
-add_dependencies(buildtests_cxx reference_counted_ptr_test)
-add_dependencies(buildtests_cxx reference_counted_test)
+add_dependencies(buildtests_cxx ref_counted_ptr_test)
+add_dependencies(buildtests_cxx ref_counted_test)
 add_dependencies(buildtests_cxx secure_auth_context_test)
 if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
 add_dependencies(buildtests_cxx secure_sync_unary_ping_pong_test)
@ -12262,14 +12262,14 @@ target_link_libraries(reconnect_interop_server
 endif (gRPC_BUILD_TESTS)
 if (gRPC_BUILD_TESTS)

-add_executable(reference_counted_ptr_test
-  test/core/support/reference_counted_ptr_test.cc
+add_executable(ref_counted_ptr_test
+  test/core/support/ref_counted_ptr_test.cc
  third_party/googletest/googletest/src/gtest-all.cc
  third_party/googletest/googlemock/src/gmock-all.cc
 )


-target_include_directories(reference_counted_ptr_test
+target_include_directories(ref_counted_ptr_test
  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
  PRIVATE ${BORINGSSL_ROOT_DIR}/include
@ -12288,7 +12288,7 @@ target_include_directories(reference_counted_ptr_test
  PRIVATE ${_gRPC_PROTO_GENS_DIR}
 )

-target_link_libraries(reference_counted_ptr_test
+target_link_libraries(ref_counted_ptr_test
  ${_gRPC_PROTOBUF_LIBRARIES}
  ${_gRPC_ALLTARGETS_LIBRARIES}
  grpc_test_util
@ -12302,14 +12302,14 @@ target_link_libraries(reference_counted_ptr_test
 endif (gRPC_BUILD_TESTS)
 if (gRPC_BUILD_TESTS)

-add_executable(reference_counted_test
-  test/core/support/reference_counted_test.cc
+add_executable(ref_counted_test
+  test/core/support/ref_counted_test.cc
  third_party/googletest/googletest/src/gtest-all.cc
  third_party/googletest/googlemock/src/gmock-all.cc
 )


-target_include_directories(reference_counted_test
+target_include_directories(ref_counted_test
  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
  PRIVATE ${BORINGSSL_ROOT_DIR}/include
@ -12328,7 +12328,7 @@ target_include_directories(reference_counted_test
  PRIVATE ${_gRPC_PROTO_GENS_DIR}
 )

-target_link_libraries(reference_counted_test
+target_link_libraries(ref_counted_test
  ${_gRPC_PROTOBUF_LIBRARIES}
  ${_gRPC_ALLTARGETS_LIBRARIES}
  grpc_test_util
--- a/60
+++ b/60
@ -1165,8 +1165,8 @@ qps_openloop_test: $(BINDIR)/$(CONFIG)/qps_openloop_test
 qps_worker: $(BINDIR)/$(CONFIG)/qps_worker
 reconnect_interop_client: $(BINDIR)/$(CONFIG)/reconnect_interop_client
 reconnect_interop_server: $(BINDIR)/$(CONFIG)/reconnect_interop_server
-reference_counted_ptr_test: $(BINDIR)/$(CONFIG)/reference_counted_ptr_test
-reference_counted_test: $(BINDIR)/$(CONFIG)/reference_counted_test
+ref_counted_ptr_test: $(BINDIR)/$(CONFIG)/ref_counted_ptr_test
+ref_counted_test: $(BINDIR)/$(CONFIG)/ref_counted_test
 secure_auth_context_test: $(BINDIR)/$(CONFIG)/secure_auth_context_test
 secure_sync_unary_ping_pong_test: $(BINDIR)/$(CONFIG)/secure_sync_unary_ping_pong_test
 server_builder_plugin_test: $(BINDIR)/$(CONFIG)/server_builder_plugin_test
@ -1603,8 +1603,8 @@ buildtests_cxx: privatelibs_cxx \
  $(BINDIR)/$(CONFIG)/qps_worker \
  $(BINDIR)/$(CONFIG)/reconnect_interop_client \
  $(BINDIR)/$(CONFIG)/reconnect_interop_server \
-  $(BINDIR)/$(CONFIG)/reference_counted_ptr_test \
-  $(BINDIR)/$(CONFIG)/reference_counted_test \
+  $(BINDIR)/$(CONFIG)/ref_counted_ptr_test \
+  $(BINDIR)/$(CONFIG)/ref_counted_test \
  $(BINDIR)/$(CONFIG)/secure_auth_context_test \
  $(BINDIR)/$(CONFIG)/secure_sync_unary_ping_pong_test \
  $(BINDIR)/$(CONFIG)/server_builder_plugin_test \
@ -1731,8 +1731,8 @@ buildtests_cxx: privatelibs_cxx \
  $(BINDIR)/$(CONFIG)/qps_worker \
  $(BINDIR)/$(CONFIG)/reconnect_interop_client \
  $(BINDIR)/$(CONFIG)/reconnect_interop_server \
-  $(BINDIR)/$(CONFIG)/reference_counted_ptr_test \
-  $(BINDIR)/$(CONFIG)/reference_counted_test \
+  $(BINDIR)/$(CONFIG)/ref_counted_ptr_test \
+  $(BINDIR)/$(CONFIG)/ref_counted_test \
  $(BINDIR)/$(CONFIG)/secure_auth_context_test \
  $(BINDIR)/$(CONFIG)/secure_sync_unary_ping_pong_test \
  $(BINDIR)/$(CONFIG)/server_builder_plugin_test \
@ -2136,10 +2136,10 @@ test_cxx: buildtests_cxx
 	$(Q) $(BINDIR)/$(CONFIG)/proto_utils_test || ( echo test proto_utils_test failed ; exit 1 )
 	$(E) "[RUN]     Testing qps_openloop_test"
 	$(Q) $(BINDIR)/$(CONFIG)/qps_openloop_test || ( echo test qps_openloop_test failed ; exit 1 )
-	$(E) "[RUN]     Testing reference_counted_ptr_test"
-	$(Q) $(BINDIR)/$(CONFIG)/reference_counted_ptr_test || ( echo test reference_counted_ptr_test failed ; exit 1 )
-	$(E) "[RUN]     Testing reference_counted_test"
-	$(Q) $(BINDIR)/$(CONFIG)/reference_counted_test || ( echo test reference_counted_test failed ; exit 1 )
+	$(E) "[RUN]     Testing ref_counted_ptr_test"
+	$(Q) $(BINDIR)/$(CONFIG)/ref_counted_ptr_test || ( echo test ref_counted_ptr_test failed ; exit 1 )
+	$(E) "[RUN]     Testing ref_counted_test"
+	$(Q) $(BINDIR)/$(CONFIG)/ref_counted_test || ( echo test ref_counted_test failed ; exit 1 )
 	$(E) "[RUN]     Testing secure_auth_context_test"
 	$(Q) $(BINDIR)/$(CONFIG)/secure_auth_context_test || ( echo test secure_auth_context_test failed ; exit 1 )
 	$(E) "[RUN]     Testing secure_sync_unary_ping_pong_test"
@ -16505,15 +16505,15 @@ endif
 $(OBJDIR)/$(CONFIG)/test/cpp/interop/reconnect_interop_server.o: $(GENDIR)/src/proto/grpc/testing/empty.pb.cc $(GENDIR)/src/proto/grpc/testing/empty.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/test.pb.cc $(GENDIR)/src/proto/grpc/testing/test.grpc.pb.cc


-REFERENCE_COUNTED_PTR_TEST_SRC = \
-    test/core/support/reference_counted_ptr_test.cc \
+REF_COUNTED_PTR_TEST_SRC = \
+    test/core/support/ref_counted_ptr_test.cc \

-REFERENCE_COUNTED_PTR_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(REFERENCE_COUNTED_PTR_TEST_SRC))))
+REF_COUNTED_PTR_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(REF_COUNTED_PTR_TEST_SRC))))
 ifeq ($(NO_SECURE),true)

 # You can't build secure targets if you don't have OpenSSL.

-$(BINDIR)/$(CONFIG)/reference_counted_ptr_test: openssl_dep_error
+$(BINDIR)/$(CONFIG)/ref_counted_ptr_test: openssl_dep_error

 else

@ -16524,39 +16524,39 @@ ifeq ($(NO_PROTOBUF),true)

 # You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.

-$(BINDIR)/$(CONFIG)/reference_counted_ptr_test: protobuf_dep_error
+$(BINDIR)/$(CONFIG)/ref_counted_ptr_test: protobuf_dep_error

 else

-$(BINDIR)/$(CONFIG)/reference_counted_ptr_test: $(PROTOBUF_DEP) $(REFERENCE_COUNTED_PTR_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
+$(BINDIR)/$(CONFIG)/ref_counted_ptr_test: $(PROTOBUF_DEP) $(REF_COUNTED_PTR_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
 	$(E) "[LD]      Linking $@"
 	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(REFERENCE_COUNTED_PTR_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/reference_counted_ptr_test
+	$(Q) $(LDXX) $(LDFLAGS) $(REF_COUNTED_PTR_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/ref_counted_ptr_test

 endif

 endif

-$(OBJDIR)/$(CONFIG)/test/core/support/reference_counted_ptr_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
+$(OBJDIR)/$(CONFIG)/test/core/support/ref_counted_ptr_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a

-deps_reference_counted_ptr_test: $(REFERENCE_COUNTED_PTR_TEST_OBJS:.o=.dep)
+deps_ref_counted_ptr_test: $(REF_COUNTED_PTR_TEST_OBJS:.o=.dep)

 ifneq ($(NO_SECURE),true)
 ifneq ($(NO_DEPS),true)
-include $(REFERENCE_COUNTED_PTR_TEST_OBJS:.o=.dep)
+-include $(REF_COUNTED_PTR_TEST_OBJS:.o=.dep)
 endif
 endif


-REFERENCE_COUNTED_TEST_SRC = \
-    test/core/support/reference_counted_test.cc \
+REF_COUNTED_TEST_SRC = \
+    test/core/support/ref_counted_test.cc \

-REFERENCE_COUNTED_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(REFERENCE_COUNTED_TEST_SRC))))
+REF_COUNTED_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(REF_COUNTED_TEST_SRC))))
 ifeq ($(NO_SECURE),true)

 # You can't build secure targets if you don't have OpenSSL.

-$(BINDIR)/$(CONFIG)/reference_counted_test: openssl_dep_error
+$(BINDIR)/$(CONFIG)/ref_counted_test: openssl_dep_error

 else

@ -16567,26 +16567,26 @@ ifeq ($(NO_PROTOBUF),true)

 # You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.

-$(BINDIR)/$(CONFIG)/reference_counted_test: protobuf_dep_error
+$(BINDIR)/$(CONFIG)/ref_counted_test: protobuf_dep_error

 else

-$(BINDIR)/$(CONFIG)/reference_counted_test: $(PROTOBUF_DEP) $(REFERENCE_COUNTED_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
+$(BINDIR)/$(CONFIG)/ref_counted_test: $(PROTOBUF_DEP) $(REF_COUNTED_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
 	$(E) "[LD]      Linking $@"
 	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(REFERENCE_COUNTED_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/reference_counted_test
+	$(Q) $(LDXX) $(LDFLAGS) $(REF_COUNTED_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/ref_counted_test

 endif

 endif

-$(OBJDIR)/$(CONFIG)/test/core/support/reference_counted_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
+$(OBJDIR)/$(CONFIG)/test/core/support/ref_counted_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a

-deps_reference_counted_test: $(REFERENCE_COUNTED_TEST_OBJS:.o=.dep)
+deps_ref_counted_test: $(REF_COUNTED_TEST_OBJS:.o=.dep)

 ifneq ($(NO_SECURE),true)
 ifneq ($(NO_DEPS),true)
-include $(REFERENCE_COUNTED_TEST_OBJS:.o=.dep)
+-include $(REF_COUNTED_TEST_OBJS:.o=.dep)
 endif
 endif

--- a/build.yaml
+++ b/build.yaml
@ -394,8 +394,8 @@ filegroups:
  - src/core/lib/slice/slice_internal.h
  - src/core/lib/slice/slice_string_helpers.h
  - src/core/lib/support/debug_location.h
-  - src/core/lib/support/reference_counted.h
-  - src/core/lib/support/reference_counted_ptr.h
+  - src/core/lib/support/ref_counted.h
+  - src/core/lib/support/ref_counted_ptr.h
  - src/core/lib/support/vector.h
  - src/core/lib/surface/alarm_internal.h
  - src/core/lib/surface/api_trace.h
@ -4544,12 +4544,12 @@ targets:
  - gpr_test_util
  - gpr
  - grpc++_test_config
- name: reference_counted_ptr_test
+- name: ref_counted_ptr_test
  gtest: true
  build: test
  language: c++
  src:
-  - test/core/support/reference_counted_ptr_test.cc
+  - test/core/support/ref_counted_ptr_test.cc
  deps:
  - grpc_test_util
  - grpc++
@ -4558,12 +4558,12 @@ targets:
  - gpr
  uses:
  - grpc++_test
- name: reference_counted_test
+- name: ref_counted_test
  gtest: true
  build: test
  language: c++
  src:
-  - test/core/support/reference_counted_test.cc
+  - test/core/support/ref_counted_test.cc
  deps:
  - grpc_test_util
  - grpc++
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@ -414,8 +414,8 @@ Pod::Spec.new do |s|
                      'src/core/lib/slice/slice_internal.h',
                      'src/core/lib/slice/slice_string_helpers.h',
                      'src/core/lib/support/debug_location.h',
-                      'src/core/lib/support/reference_counted.h',
-                      'src/core/lib/support/reference_counted_ptr.h',
+                      'src/core/lib/support/ref_counted.h',
+                      'src/core/lib/support/ref_counted_ptr.h',
                      'src/core/lib/support/vector.h',
                      'src/core/lib/surface/alarm_internal.h',
                      'src/core/lib/surface/api_trace.h',
@ -892,8 +892,8 @@ Pod::Spec.new do |s|
                              'src/core/lib/slice/slice_internal.h',
                              'src/core/lib/slice/slice_string_helpers.h',
                              'src/core/lib/support/debug_location.h',
-                              'src/core/lib/support/reference_counted.h',
-                              'src/core/lib/support/reference_counted_ptr.h',
+                              'src/core/lib/support/ref_counted.h',
+                              'src/core/lib/support/ref_counted_ptr.h',
                              'src/core/lib/support/vector.h',
                              'src/core/lib/surface/alarm_internal.h',
                              'src/core/lib/surface/api_trace.h',
--- a/grpc.gemspec
+++ b/grpc.gemspec
@ -345,8 +345,8 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/lib/slice/slice_internal.h )
  s.files += %w( src/core/lib/slice/slice_string_helpers.h )
  s.files += %w( src/core/lib/support/debug_location.h )
-  s.files += %w( src/core/lib/support/reference_counted.h )
-  s.files += %w( src/core/lib/support/reference_counted_ptr.h )
+  s.files += %w( src/core/lib/support/ref_counted.h )
+  s.files += %w( src/core/lib/support/ref_counted_ptr.h )
  s.files += %w( src/core/lib/support/vector.h )
  s.files += %w( src/core/lib/surface/alarm_internal.h )
  s.files += %w( src/core/lib/surface/api_trace.h )
--- a/package.xml
+++ b/package.xml
@ -357,8 +357,8 @@
    <file baseinstalldir="/" name="src/core/lib/slice/slice_internal.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/slice/slice_string_helpers.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/support/debug_location.h" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/support/reference_counted.h" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/support/reference_counted_ptr.h" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/support/ref_counted.h" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/support/ref_counted_ptr.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/support/vector.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/surface/alarm_internal.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/surface/api_trace.h" role="src" />
--- a/src/core/lib/support/reference_counted.h
+++ b/src/core/lib/support/reference_counted.h
@ -16,8 +16,8 @@
 *
 */

-#ifndef GRPC_CORE_LIB_SUPPORT_REFERENCE_COUNTED_H
-#define GRPC_CORE_LIB_SUPPORT_REFERENCE_COUNTED_H
+#ifndef GRPC_CORE_LIB_SUPPORT_REF_COUNTED_H
+#define GRPC_CORE_LIB_SUPPORT_REF_COUNTED_H

 #include <grpc/support/log.h>
 #include <grpc/support/sync.h>
@ -31,7 +31,7 @@ namespace grpc_core {
 // A base class for reference-counted objects.
 // New objects should be created via New() and start with a refcount of 1.
 // When the refcount reaches 0, the object will be deleted via Delete().
-class ReferenceCounted {
+class RefCounted {
 public:
  void Ref() { gpr_ref(&refs_); }

@ -42,29 +42,29 @@ class ReferenceCounted {
  }

  // Not copyable nor movable.
-  ReferenceCounted(const ReferenceCounted&) = delete;
-  ReferenceCounted& operator=(const ReferenceCounted&) = delete;
+  RefCounted(const RefCounted&) = delete;
+  RefCounted& operator=(const RefCounted&) = delete;

 protected:
  // Allow Delete() to access destructor.
  template <typename T>
  friend void Delete(T*);

-  ReferenceCounted() { gpr_ref_init(&refs_, 1); }
+  RefCounted() { gpr_ref_init(&refs_, 1); }

-  virtual ~ReferenceCounted() {}
+  virtual ~RefCounted() {}

 private:
  gpr_refcount refs_;
 };

-// An alternative version of the ReferenceCounted base class that
+// An alternative version of the RefCounted base class that
 // supports tracing.  This is intended to be used in cases where the
 // object will be handled both by idiomatic C++ code using smart
 // pointers and legacy code that is manually calling Ref() and Unref().
 // Once all of our code is converted to idiomatic C++, we may be able to
 // eliminate this class.
-class ReferenceCountedWithTracing {
+class RefCountedWithTracing {
 public:
  void Ref() { gpr_ref(&refs_); }

@ -95,23 +95,22 @@ class ReferenceCountedWithTracing {
  }

  // Not copyable nor movable.
-  ReferenceCountedWithTracing(const ReferenceCountedWithTracing&) = delete;
-  ReferenceCountedWithTracing& operator=(const ReferenceCountedWithTracing&) =
-      delete;
+  RefCountedWithTracing(const RefCountedWithTracing&) = delete;
+  RefCountedWithTracing& operator=(const RefCountedWithTracing&) = delete;

 protected:
  // Allow Delete() to access destructor.
  template <typename T>
  friend void Delete(T*);

-  ReferenceCountedWithTracing() : ReferenceCountedWithTracing(nullptr) {}
+  RefCountedWithTracing() : RefCountedWithTracing(nullptr) {}

-  explicit ReferenceCountedWithTracing(TraceFlag* trace_flag)
+  explicit RefCountedWithTracing(TraceFlag* trace_flag)
      : trace_flag_(trace_flag) {
    gpr_ref_init(&refs_, 1);
  }

-  virtual ~ReferenceCountedWithTracing() {}
+  virtual ~RefCountedWithTracing() {}

 private:
  TraceFlag* trace_flag_ = nullptr;
@ -120,4 +119,4 @@ class ReferenceCountedWithTracing {

 }  // namespace grpc_core

-#endif /* GRPC_CORE_LIB_SUPPORT_REFERENCE_COUNTED_H */
+#endif /* GRPC_CORE_LIB_SUPPORT_REF_COUNTED_H */
--- a/src/core/lib/support/reference_counted_ptr.h
+++ b/src/core/lib/support/reference_counted_ptr.h
@ -16,8 +16,8 @@
 *
 */

-#ifndef GRPC_CORE_LIB_SUPPORT_REFERENCE_COUNTED_PTR_H
-#define GRPC_CORE_LIB_SUPPORT_REFERENCE_COUNTED_PTR_H
+#ifndef GRPC_CORE_LIB_SUPPORT_REF_COUNTED_PTR_H
+#define GRPC_CORE_LIB_SUPPORT_REF_COUNTED_PTR_H

 #include <utility>

@ -26,21 +26,21 @@
 namespace grpc_core {

 // A smart pointer class for objects that provide Ref() and Unref() methods,
-// such as those provided by the ReferenceCounted base class.
+// such as those provided by the RefCounted base class.
 template <typename T>
-class ReferenceCountedPtr {
+class RefCountedPtr {
 public:
-  ReferenceCountedPtr() {}
+  RefCountedPtr() {}

  // If value is non-null, we take ownership of a ref to it.
-  explicit ReferenceCountedPtr(T* value) { value_ = value; }
+  explicit RefCountedPtr(T* value) { value_ = value; }

  // Move support.
-  ReferenceCountedPtr(ReferenceCountedPtr&& other) {
+  RefCountedPtr(RefCountedPtr&& other) {
    value_ = other.value_;
    other.value_ = nullptr;
  }
-  ReferenceCountedPtr& operator=(ReferenceCountedPtr&& other) {
+  RefCountedPtr& operator=(RefCountedPtr&& other) {
    if (value_ != nullptr) value_->Unref();
    value_ = other.value_;
    other.value_ = nullptr;
@ -48,11 +48,11 @@ class ReferenceCountedPtr {
  }

  // Copy support.
-  ReferenceCountedPtr(const ReferenceCountedPtr& other) {
+  RefCountedPtr(const RefCountedPtr& other) {
    if (other.value_ != nullptr) other.value_->Ref();
    value_ = other.value_;
  }
-  ReferenceCountedPtr& operator=(const ReferenceCountedPtr& other) {
+  RefCountedPtr& operator=(const RefCountedPtr& other) {
    // Note: Order of reffing and unreffing is important here in case value_
    // and other.value_ are the same object.
    if (other.value_ != nullptr) other.value_->Ref();
@ -61,7 +61,7 @@ class ReferenceCountedPtr {
    return *this;
  }

-  ~ReferenceCountedPtr() {
+  ~RefCountedPtr() {
    if (value_ != nullptr) value_->Unref();
  }

@ -81,10 +81,10 @@ class ReferenceCountedPtr {
 };

 template <typename T, typename... Args>
-inline ReferenceCountedPtr<T> MakeReferenceCounted(Args&&... args) {
-  return ReferenceCountedPtr<T>(New<T>(std::forward<Args>(args)...));
+inline RefCountedPtr<T> MakeRefCounted(Args&&... args) {
+  return RefCountedPtr<T>(New<T>(std::forward<Args>(args)...));
 }

 }  // namespace grpc_core

-#endif /* GRPC_CORE_LIB_SUPPORT_REFERENCE_COUNTED_PTR_H */
+#endif /* GRPC_CORE_LIB_SUPPORT_REF_COUNTED_PTR_H */
--- a/test/core/support/BUILD
+++ b/test/core/support/BUILD
@ -235,11 +235,11 @@ grpc_cc_test(
 )

 grpc_cc_test(
-    name = "reference_counted_test",
-    srcs = ["reference_counted_test.cc"],
+    name = "ref_counted_test",
+    srcs = ["ref_counted_test.cc"],
    language = "C++",
    deps = [
-        "//:reference_counted",
+        "//:ref_counted",
        "//test/core/util:gpr_test_util",
    ],
    external_deps = [
@ -248,12 +248,12 @@ grpc_cc_test(
 )

 grpc_cc_test(
-    name = "reference_counted_ptr_test",
-    srcs = ["reference_counted_ptr_test.cc"],
+    name = "ref_counted_ptr_test",
+    srcs = ["ref_counted_ptr_test.cc"],
    language = "C++",
    deps = [
-        "//:reference_counted",
-        "//:reference_counted_ptr",
+        "//:ref_counted",
+        "//:ref_counted_ptr",
        "//test/core/util:gpr_test_util",
    ],
    external_deps = [
--- a/test/core/support/reference_counted_ptr_test.cc
+++ b/test/core/support/reference_counted_ptr_test.cc
@ -16,21 +16,21 @@
 *
 */

-#include "src/core/lib/support/reference_counted_ptr.h"
+#include "src/core/lib/support/ref_counted_ptr.h"

 #include <gtest/gtest.h>

 #include <grpc/support/log.h>

 #include "src/core/lib/support/memory.h"
-#include "src/core/lib/support/reference_counted.h"
+#include "src/core/lib/support/ref_counted.h"
 #include "test/core/util/test_config.h"

 namespace grpc_core {
 namespace testing {
 namespace {

-class Foo : public ReferenceCounted {
+class Foo : public RefCounted {
 public:
  Foo() : value_(0) {}

@ -42,76 +42,76 @@ class Foo : public ReferenceCounted {
  int value_;
 };

-TEST(ReferenceCountedPtr, DefaultConstructor) { ReferenceCountedPtr<Foo> foo; }
+TEST(RefCountedPtr, DefaultConstructor) { RefCountedPtr<Foo> foo; }

-TEST(ReferenceCountedPtr, ExplicitConstructorEmpty) {
-  ReferenceCountedPtr<Foo> foo(nullptr);
+TEST(RefCountedPtr, ExplicitConstructorEmpty) {
+  RefCountedPtr<Foo> foo(nullptr);
 }

-TEST(ReferenceCountedPtr, ExplicitConstructor) {
-  ReferenceCountedPtr<Foo> foo(New<Foo>());
+TEST(RefCountedPtr, ExplicitConstructor) {
+  RefCountedPtr<Foo> foo(New<Foo>());
 }

-TEST(ReferenceCountedPtr, MoveConstructor) {
-  ReferenceCountedPtr<Foo> foo(New<Foo>());
-  ReferenceCountedPtr<Foo> foo2(std::move(foo));
+TEST(RefCountedPtr, MoveConstructor) {
+  RefCountedPtr<Foo> foo(New<Foo>());
+  RefCountedPtr<Foo> foo2(std::move(foo));
  EXPECT_EQ(nullptr, foo.get());
  EXPECT_NE(nullptr, foo2.get());
 }

-TEST(ReferenceCountedPtr, MoveAssignment) {
-  ReferenceCountedPtr<Foo> foo(New<Foo>());
-  ReferenceCountedPtr<Foo> foo2 = std::move(foo);
+TEST(RefCountedPtr, MoveAssignment) {
+  RefCountedPtr<Foo> foo(New<Foo>());
+  RefCountedPtr<Foo> foo2 = std::move(foo);
  EXPECT_EQ(nullptr, foo.get());
  EXPECT_NE(nullptr, foo2.get());
 }

-TEST(ReferenceCountedPtr, CopyConstructor) {
-  ReferenceCountedPtr<Foo> foo(New<Foo>());
-  ReferenceCountedPtr<Foo> foo2(foo);
+TEST(RefCountedPtr, CopyConstructor) {
+  RefCountedPtr<Foo> foo(New<Foo>());
+  RefCountedPtr<Foo> foo2(foo);
  EXPECT_NE(nullptr, foo.get());
  EXPECT_EQ(foo.get(), foo2.get());
 }

-TEST(ReferenceCountedPtr, CopyAssignment) {
-  ReferenceCountedPtr<Foo> foo(New<Foo>());
-  ReferenceCountedPtr<Foo> foo2 = foo;
+TEST(RefCountedPtr, CopyAssignment) {
+  RefCountedPtr<Foo> foo(New<Foo>());
+  RefCountedPtr<Foo> foo2 = foo;
  EXPECT_NE(nullptr, foo.get());
  EXPECT_EQ(foo.get(), foo2.get());
 }

-TEST(ReferenceCountedPtr, CopyAssignmentWhenEmpty) {
-  ReferenceCountedPtr<Foo> foo;
-  ReferenceCountedPtr<Foo> foo2;
+TEST(RefCountedPtr, CopyAssignmentWhenEmpty) {
+  RefCountedPtr<Foo> foo;
+  RefCountedPtr<Foo> foo2;
  foo2 = foo;
  EXPECT_EQ(nullptr, foo.get());
  EXPECT_EQ(nullptr, foo2.get());
 }

-TEST(ReferenceCountedPtr, CopyAssignmentToSelf) {
-  ReferenceCountedPtr<Foo> foo(New<Foo>());
+TEST(RefCountedPtr, CopyAssignmentToSelf) {
+  RefCountedPtr<Foo> foo(New<Foo>());
  foo = foo;
 }

-TEST(ReferenceCountedPtr, EnclosedScope) {
-  ReferenceCountedPtr<Foo> foo(New<Foo>());
+TEST(RefCountedPtr, EnclosedScope) {
+  RefCountedPtr<Foo> foo(New<Foo>());
  {
-    ReferenceCountedPtr<Foo> foo2(std::move(foo));
+    RefCountedPtr<Foo> foo2(std::move(foo));
    EXPECT_EQ(nullptr, foo.get());
    EXPECT_NE(nullptr, foo2.get());
  }
  EXPECT_EQ(nullptr, foo.get());
 }

-TEST(ReferenceCountedPtr, ResetFromNullToNonNull) {
-  ReferenceCountedPtr<Foo> foo;
+TEST(RefCountedPtr, ResetFromNullToNonNull) {
+  RefCountedPtr<Foo> foo;
  EXPECT_EQ(nullptr, foo.get());
  foo.reset(New<Foo>());
  EXPECT_NE(nullptr, foo.get());
 }

-TEST(ReferenceCountedPtr, ResetFromNonNullToNonNull) {
-  ReferenceCountedPtr<Foo> foo(New<Foo>());
+TEST(RefCountedPtr, ResetFromNonNullToNonNull) {
+  RefCountedPtr<Foo> foo(New<Foo>());
  EXPECT_NE(nullptr, foo.get());
  Foo* original = foo.get();
  foo.reset(New<Foo>());
@ -119,46 +119,46 @@ TEST(ReferenceCountedPtr, ResetFromNonNullToNonNull) {
  EXPECT_NE(original, foo.get());
 }

-TEST(ReferenceCountedPtr, ResetFromNonNullToNull) {
-  ReferenceCountedPtr<Foo> foo(New<Foo>());
+TEST(RefCountedPtr, ResetFromNonNullToNull) {
+  RefCountedPtr<Foo> foo(New<Foo>());
  EXPECT_NE(nullptr, foo.get());
  foo.reset();
  EXPECT_EQ(nullptr, foo.get());
 }

-TEST(ReferenceCountedPtr, ResetFromNullToNull) {
-  ReferenceCountedPtr<Foo> foo;
+TEST(RefCountedPtr, ResetFromNullToNull) {
+  RefCountedPtr<Foo> foo;
  EXPECT_EQ(nullptr, foo.get());
  foo.reset(nullptr);
  EXPECT_EQ(nullptr, foo.get());
 }

-TEST(ReferenceCountedPtr, DerefernceOperators) {
-  ReferenceCountedPtr<Foo> foo(New<Foo>());
+TEST(RefCountedPtr, DerefernceOperators) {
+  RefCountedPtr<Foo> foo(New<Foo>());
  foo->value();
  Foo& foo_ref = *foo;
  foo_ref.value();
 }

-TEST(MakeReferenceCounted, NoArgs) {
-  ReferenceCountedPtr<Foo> foo = MakeReferenceCounted<Foo>();
+TEST(MakeRefCounted, NoArgs) {
+  RefCountedPtr<Foo> foo = MakeRefCounted<Foo>();
  EXPECT_EQ(0, foo->value());
 }

-TEST(MakeReferenceCounted, Args) {
-  ReferenceCountedPtr<Foo> foo = MakeReferenceCounted<Foo>(3);
+TEST(MakeRefCounted, Args) {
+  RefCountedPtr<Foo> foo = MakeRefCounted<Foo>(3);
  EXPECT_EQ(3, foo->value());
 }

 TraceFlag foo_tracer(true, "foo");

-class FooWithTracing : public ReferenceCountedWithTracing {
+class FooWithTracing : public RefCountedWithTracing {
 public:
-  FooWithTracing() : ReferenceCountedWithTracing(&foo_tracer) {}
+  FooWithTracing() : RefCountedWithTracing(&foo_tracer) {}
 };

-TEST(ReferenceCountedPtr, ReferenceCountedWithTracing) {
-  ReferenceCountedPtr<FooWithTracing> foo(New<FooWithTracing>());
+TEST(RefCountedPtr, RefCountedWithTracing) {
+  RefCountedPtr<FooWithTracing> foo(New<FooWithTracing>());
  foo->Ref(DEBUG_LOCATION, "foo");
  foo->Unref(DEBUG_LOCATION, "foo");
 }
--- a/test/core/support/reference_counted_test.cc
+++ b/test/core/support/reference_counted_test.cc
@ -16,7 +16,7 @@
 *
 */

-#include "src/core/lib/support/reference_counted.h"
+#include "src/core/lib/support/ref_counted.h"

 #include <gtest/gtest.h>

@ -27,17 +27,17 @@ namespace grpc_core {
 namespace testing {
 namespace {

-class Foo : public ReferenceCounted {
+class Foo : public RefCounted {
 public:
  Foo() {}
 };

-TEST(ReferenceCounted, Basic) {
+TEST(RefCounted, Basic) {
  Foo* foo = New<Foo>();
  foo->Unref();
 }

-TEST(ReferenceCounted, ExtraRef) {
+TEST(RefCounted, ExtraRef) {
  Foo* foo = New<Foo>();
  foo->Ref();
  foo->Unref();
@ -46,12 +46,12 @@ TEST(ReferenceCounted, ExtraRef) {

 TraceFlag foo_tracer(true, "foo");

-class FooWithTracing : public ReferenceCountedWithTracing {
+class FooWithTracing : public RefCountedWithTracing {
 public:
-  FooWithTracing() : ReferenceCountedWithTracing(&foo_tracer) {}
+  FooWithTracing() : RefCountedWithTracing(&foo_tracer) {}
 };

-TEST(ReferenceCountedWithTracing, Basic) {
+TEST(RefCountedWithTracing, Basic) {
  FooWithTracing* foo = New<FooWithTracing>();
  foo->Ref(DEBUG_LOCATION, "extra_ref");
  foo->Unref(DEBUG_LOCATION, "extra_ref");
--- a/tools/doxygen/Doxyfile.c++.internal
+++ b/tools/doxygen/Doxyfile.c++.internal
@ -1037,8 +1037,8 @@ src/core/lib/support/manual_constructor.h \
 src/core/lib/support/memory.h \
 src/core/lib/support/mpscq.h \
 src/core/lib/support/murmur_hash.h \
-src/core/lib/support/reference_counted.h \
-src/core/lib/support/reference_counted_ptr.h \
+src/core/lib/support/ref_counted.h \
+src/core/lib/support/ref_counted_ptr.h \
 src/core/lib/support/spinlock.h \
 src/core/lib/support/stack_lockfree.h \
 src/core/lib/support/string.h \
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@ -1299,8 +1299,8 @@ src/core/lib/support/mpscq.cc \
 src/core/lib/support/mpscq.h \
 src/core/lib/support/murmur_hash.cc \
 src/core/lib/support/murmur_hash.h \
-src/core/lib/support/reference_counted.h \
-src/core/lib/support/reference_counted_ptr.h \
+src/core/lib/support/ref_counted.h \
+src/core/lib/support/ref_counted_ptr.h \
 src/core/lib/support/spinlock.h \
 src/core/lib/support/stack_lockfree.cc \
 src/core/lib/support/stack_lockfree.h \
--- a/tools/run_tests/generated/sources_and_headers.json
+++ b/tools/run_tests/generated/sources_and_headers.json
@ -3929,9 +3929,9 @@
    "headers": [], 
    "is_filegroup": false, 
    "language": "c++", 
-    "name": "reference_counted_ptr_test", 
+    "name": "ref_counted_ptr_test", 
    "src": [
-      "test/core/support/reference_counted_ptr_test.cc"
+      "test/core/support/ref_counted_ptr_test.cc"
    ], 
    "third_party": false, 
    "type": "target"
@ -3948,9 +3948,9 @@
    "headers": [], 
    "is_filegroup": false, 
    "language": "c++", 
-    "name": "reference_counted_test", 
+    "name": "ref_counted_test", 
    "src": [
-      "test/core/support/reference_counted_test.cc"
+      "test/core/support/ref_counted_test.cc"
    ], 
    "third_party": false, 
    "type": "target"
@ -8259,8 +8259,8 @@
      "src/core/lib/slice/slice_internal.h", 
      "src/core/lib/slice/slice_string_helpers.h", 
      "src/core/lib/support/debug_location.h", 
-      "src/core/lib/support/reference_counted.h", 
-      "src/core/lib/support/reference_counted_ptr.h", 
+      "src/core/lib/support/ref_counted.h", 
+      "src/core/lib/support/ref_counted_ptr.h", 
      "src/core/lib/support/vector.h", 
      "src/core/lib/surface/alarm_internal.h", 
      "src/core/lib/surface/api_trace.h", 
@ -8398,8 +8398,8 @@
      "src/core/lib/slice/slice_internal.h", 
      "src/core/lib/slice/slice_string_helpers.h", 
      "src/core/lib/support/debug_location.h", 
-      "src/core/lib/support/reference_counted.h", 
-      "src/core/lib/support/reference_counted_ptr.h", 
+      "src/core/lib/support/ref_counted.h", 
+      "src/core/lib/support/ref_counted_ptr.h", 
      "src/core/lib/support/vector.h", 
      "src/core/lib/surface/alarm_internal.h", 
      "src/core/lib/surface/api_trace.h", 
--- a/tools/run_tests/generated/tests.json
+++ b/tools/run_tests/generated/tests.json
@ -4138,7 +4138,7 @@
    "flaky": false, 
    "gtest": true, 
    "language": "c++", 
-    "name": "reference_counted_ptr_test", 
+    "name": "ref_counted_ptr_test", 
    "platforms": [
      "linux", 
      "mac", 
@ -4162,7 +4162,7 @@
    "flaky": false, 
    "gtest": true, 
    "language": "c++", 
-    "name": "reference_counted_test", 
+    "name": "ref_counted_test", 
    "platforms": [
      "linux", 
      "mac",