From 2629fe7d6c8012931a23d66e51143fd064d4cadf Mon Sep 17 00:00:00 2001
From: Ashitha Santhosh <ashithasantosh@google.com>
Date: Mon, 17 Aug 2020 16:50:00 -0700
Subject: [PATCH 1/2] Updated namespace to avoid collision.

---
 .../lib/security/authorization/mock_cel/activation.h | 12 ++++--------
 .../lib/security/authorization/mock_cel/cel_value.h  | 12 ++++--------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/src/core/lib/security/authorization/mock_cel/activation.h b/src/core/lib/security/authorization/mock_cel/activation.h
index 626923d4b19..169b6341721 100644
--- a/src/core/lib/security/authorization/mock_cel/activation.h
+++ b/src/core/lib/security/authorization/mock_cel/activation.h
@@ -21,10 +21,8 @@
 
 #include "src/core/lib/security/authorization/mock_cel/cel_value.h"
 
-namespace google {
-namespace api {
-namespace expr {
-namespace runtime {
+namespace grpc_core {
+namespace mock_cel{
 
 // Base class for an activation. This is a temporary stub implementation of CEL
 // APIs. Once gRPC imports the CEL library, this class will be removed.
@@ -53,9 +51,7 @@ class Activation : public BaseActivation {
   void InsertValue(absl::string_view name, const CelValue& value) {}
 };
 
-}  // namespace runtime
-}  // namespace expr
-}  // namespace api
-}  // namespace google
+}  // namespace mock_cel
+}  // namespace grpc_core
 
 #endif  // GRPC_CORE_LIB_SECURITY_AUTHORIZATION_MOCK_CEL_ACTIVATION_H
diff --git a/src/core/lib/security/authorization/mock_cel/cel_value.h b/src/core/lib/security/authorization/mock_cel/cel_value.h
index 65f0e1ea532..735c96652c5 100644
--- a/src/core/lib/security/authorization/mock_cel/cel_value.h
+++ b/src/core/lib/security/authorization/mock_cel/cel_value.h
@@ -34,10 +34,8 @@
 
 #include "absl/strings/string_view.h"
 
-namespace google {
-namespace api {
-namespace expr {
-namespace runtime {
+namespace grpc_core {
+namespace mock_cel {
 
 // Break cyclic depdendencies for container types.
 class CelMap;
@@ -75,9 +73,7 @@ class CelValue {
   explicit CelValue(T value) {}
 };
 
-}  // namespace runtime
-}  // namespace expr
-}  // namespace api
-}  // namespace google
+}  // namespace mock_cel
+}  // namespace grpc_core
 
 #endif  // GRPC_CORE_LIB_SECURITY_AUTHORIZATION_MOCK_CEL_CEL_VALUE_H

From 86c609af23ce17bbcb25d3b9b9e78d4000548860 Mon Sep 17 00:00:00 2001
From: Ashitha Santhosh <ashithasantosh@google.com>
Date: Mon, 17 Aug 2020 17:19:54 -0700
Subject: [PATCH 2/2] Formatted code.

---
 src/core/lib/security/authorization/mock_cel/activation.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/lib/security/authorization/mock_cel/activation.h b/src/core/lib/security/authorization/mock_cel/activation.h
index 169b6341721..693ed4d47ac 100644
--- a/src/core/lib/security/authorization/mock_cel/activation.h
+++ b/src/core/lib/security/authorization/mock_cel/activation.h
@@ -22,7 +22,7 @@
 #include "src/core/lib/security/authorization/mock_cel/cel_value.h"
 
 namespace grpc_core {
-namespace mock_cel{
+namespace mock_cel {
 
 // Base class for an activation. This is a temporary stub implementation of CEL
 // APIs. Once gRPC imports the CEL library, this class will be removed.