Merge pull request #14089 from markdroth/no_plus_in_directory_names

Rename 'gpr++' directories to 'gprpp'.

7 files changed, 16 insertions, 15 deletions

diff --git a/test/core/gpr++/BUILD b/test/core/gprpp/BUILD
index 93324a378b..1c11e0bdb5 100644
--- a/test/core/gpr++/BUILD
+++ b/test/core/gprpp/BUILD
@@ -16,7 +16,7 @@ load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_c
 
 licenses(["notice"])  # Apache v2
 
-grpc_package(name = "test/core/gpr++")
+grpc_package(name = "test/core/gprpp")
 
 grpc_cc_test(
     name = "manual_constructor_test",
@@ -24,6 +24,7 @@ grpc_cc_test(
     language = "C++",
     deps = [
         "//:gpr",
+        "//:gpr++_base",
         "//test/core/util:gpr_test_util",
     ],
 )
@@ -36,7 +37,7 @@ grpc_cc_test(
     ],
     language = "C++",
     deps = [
-        "//:grpc",
+        "//:gpr++_base",
         "//test/core/util:gpr_test_util",
     ],
 )
@@ -49,7 +50,7 @@ grpc_cc_test(
     ],
     language = "C++",
     deps = [
-        "//:grpc",
+        "//:inlined_vector",
         "//test/core/util:gpr_test_util",
     ],
 )
diff --git a/test/core/gpr++/inlined_vector_test.cc b/test/core/gprpp/inlined_vector_test.cc
index 09d5453a56..0e712dafe4 100644
--- a/test/core/gpr++/inlined_vector_test.cc
+++ b/test/core/gprpp/inlined_vector_test.cc
@@ -16,9 +16,9 @@
  *
  */
 
-#include "src/core/lib/gpr++/inlined_vector.h"
+#include "src/core/lib/gprpp/inlined_vector.h"
 #include <gtest/gtest.h>
-#include "src/core/lib/gpr++/memory.h"
+#include "src/core/lib/gprpp/memory.h"
 #include "test/core/util/test_config.h"
 
 namespace grpc_core {
diff --git a/test/core/gpr++/manual_constructor_test.cc b/test/core/gprpp/manual_constructor_test.cc
index e049b793f6..f06c3cab06 100644
--- a/test/core/gpr++/manual_constructor_test.cc
+++ b/test/core/gprpp/manual_constructor_test.cc
@@ -18,7 +18,7 @@
 
 /* Test of gpr synchronization support. */
 
-#include "src/core/lib/gpr++/manual_constructor.h"
+#include "src/core/lib/gprpp/manual_constructor.h"
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
 #include <grpc/support/sync.h>
@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <cstring>
-#include "src/core/lib/gpr++/abstract.h"
+#include "src/core/lib/gprpp/abstract.h"
 #include "test/core/util/test_config.h"
 
 class A {
diff --git a/test/core/gpr++/memory_test.cc b/test/core/gprpp/memory_test.cc
index 3553e119e3..180c36fad7 100644
--- a/test/core/gpr++/memory_test.cc
+++ b/test/core/gprpp/memory_test.cc
@@ -16,7 +16,7 @@
  *
  */
 
-#include "src/core/lib/gpr++/memory.h"
+#include "src/core/lib/gprpp/memory.h"
 #include <gtest/gtest.h>
 #include "test/core/util/test_config.h"
 
diff --git a/test/core/gpr++/orphanable_test.cc b/test/core/gprpp/orphanable_test.cc
index 4513d25da1..ff2f6d8bc2 100644
--- a/test/core/gpr++/orphanable_test.cc
+++ b/test/core/gprpp/orphanable_test.cc
@@ -16,11 +16,11 @@
  *
  */
 
-#include "src/core/lib/gpr++/orphanable.h"
+#include "src/core/lib/gprpp/orphanable.h"
 
 #include <gtest/gtest.h>
 
-#include "src/core/lib/gpr++/memory.h"
+#include "src/core/lib/gprpp/memory.h"
 #include "test/core/util/test_config.h"
 
 namespace grpc_core {
diff --git a/test/core/gpr++/ref_counted_ptr_test.cc b/test/core/gprpp/ref_counted_ptr_test.cc
index e897b2859c..f1f13f3183 100644
--- a/test/core/gpr++/ref_counted_ptr_test.cc
+++ b/test/core/gprpp/ref_counted_ptr_test.cc
@@ -16,14 +16,14 @@
  *
  */
 
-#include "src/core/lib/gpr++/ref_counted_ptr.h"
+#include "src/core/lib/gprpp/ref_counted_ptr.h"
 
 #include <gtest/gtest.h>
 
 #include <grpc/support/log.h>
 
-#include "src/core/lib/gpr++/memory.h"
-#include "src/core/lib/gpr++/ref_counted.h"
+#include "src/core/lib/gprpp/memory.h"
+#include "src/core/lib/gprpp/ref_counted.h"
 #include "test/core/util/test_config.h"
 
 namespace grpc_core {
diff --git a/test/core/gpr++/ref_counted_test.cc b/test/core/gprpp/ref_counted_test.cc
index 568ec51c64..b1b0fee5c0 100644
--- a/test/core/gpr++/ref_counted_test.cc
+++ b/test/core/gprpp/ref_counted_test.cc
@@ -16,11 +16,11 @@
  *
  */
 
-#include "src/core/lib/gpr++/ref_counted.h"
+#include "src/core/lib/gprpp/ref_counted.h"
 
 #include <gtest/gtest.h>
 
-#include "src/core/lib/gpr++/memory.h"
+#include "src/core/lib/gprpp/memory.h"
 #include "test/core/util/test_config.h"
 
 namespace grpc_core {