From 3824288bad41e710d85ddb7d42d564481d25ee9a Mon Sep 17 00:00:00 2001
From: Eugene Ostroukhov <eostroukhov@google.com>
Date: Thu, 7 Sep 2023 09:15:09 -0700
Subject: [PATCH] [Tests] Move the http_proxy_mapper_test.cc back (#34268)

---
 CMakeLists.txt                                |  2 +-
 build_autogenerated.yaml                      |  5 +--
 test/core/client_channel/BUILD                | 14 +++++++
 .../client_channel/http_proxy_mapper_test.cc  |  0
 test/core/ext/filters/client_channel/BUILD    | 37 -------------------
 5 files changed, 17 insertions(+), 41 deletions(-)
 rename test/core/{ext/filters => }/client_channel/http_proxy_mapper_test.cc (100%)
 delete mode 100644 test/core/ext/filters/client_channel/BUILD

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6fcb18b9d5a26..569cf60401baa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14043,7 +14043,7 @@ endif()
 if(gRPC_BUILD_TESTS)
 
 add_executable(http_proxy_mapper_test
-  test/core/ext/filters/client_channel/http_proxy_mapper_test.cc
+  test/core/client_channel/http_proxy_mapper_test.cc
 )
 target_compile_features(http_proxy_mapper_test PUBLIC cxx_std_14)
 target_include_directories(http_proxy_mapper_test
diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml
index 9e5d07c8d5d57..5ae25305e8115 100644
--- a/build_autogenerated.yaml
+++ b/build_autogenerated.yaml
@@ -9825,10 +9825,9 @@ targets:
   gtest: true
   build: test
   language: c++
-  headers:
-  - test/core/util/scoped_env_var.h
+  headers: []
   src:
-  - test/core/ext/filters/client_channel/http_proxy_mapper_test.cc
+  - test/core/client_channel/http_proxy_mapper_test.cc
   deps:
   - gtest
   - grpc_test_util
diff --git a/test/core/client_channel/BUILD b/test/core/client_channel/BUILD
index 08caf2c5ba395..478a320fde804 100644
--- a/test/core/client_channel/BUILD
+++ b/test/core/client_channel/BUILD
@@ -32,6 +32,20 @@ grpc_cc_test(
     ],
 )
 
+grpc_cc_test(
+    name = "http_proxy_mapper_test",
+    srcs = ["http_proxy_mapper_test.cc"],
+    external_deps = ["gtest"],
+    language = "C++",
+    uses_polling = False,
+    deps = [
+        "//:gpr",
+        "//:grpc",
+        "//src/core:channel_args",
+        "//test/core/util:grpc_test_util",
+    ],
+)
+
 grpc_cc_test(
     name = "retry_throttle_test",
     srcs = ["retry_throttle_test.cc"],
diff --git a/test/core/ext/filters/client_channel/http_proxy_mapper_test.cc b/test/core/client_channel/http_proxy_mapper_test.cc
similarity index 100%
rename from test/core/ext/filters/client_channel/http_proxy_mapper_test.cc
rename to test/core/client_channel/http_proxy_mapper_test.cc
diff --git a/test/core/ext/filters/client_channel/BUILD b/test/core/ext/filters/client_channel/BUILD
deleted file mode 100644
index 717c887039837..0000000000000
--- a/test/core/ext/filters/client_channel/BUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2023 gRPC authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-load(
-    "//bazel:grpc_build_system.bzl",
-    "grpc_cc_test",
-    "grpc_package",
-)
-
-grpc_package(name = "test/core/ext/filters/client_channel")
-
-licenses(["notice"])
-
-grpc_cc_test(
-    name = "http_proxy_mapper_test",
-    srcs = ["http_proxy_mapper_test.cc"],
-    external_deps = ["gtest"],
-    language = "C++",
-    uses_polling = False,
-    deps = [
-        "//:gpr",
-        "//:grpc_client_channel",
-        "//test/core/util:grpc_test_util",
-        "//test/core/util:scoped_env_var",
-    ],
-)