Fix Tricorder errors in BlindSignAuth
PiperOrigin-RevId: 561148673
diff --git a/build/source_list.bzl b/build/source_list.bzl
index fd1b6e0..10d593d 100644
--- a/build/source_list.bzl
+++ b/build/source_list.bzl
@@ -1586,6 +1586,7 @@
"blind_sign_auth/anonymous_tokens/cpp/testing/utils.h",
"blind_sign_auth/blind_sign_auth.h",
"blind_sign_auth/blind_sign_auth_interface.h",
+ "blind_sign_auth/blind_sign_auth_protos.h",
"blind_sign_auth/blind_sign_http_interface.h",
"blind_sign_auth/blind_sign_http_response.h",
"blind_sign_auth/cached_blind_sign_auth.h",
diff --git a/build/source_list.gni b/build/source_list.gni
index d484e91..5060516 100644
--- a/build/source_list.gni
+++ b/build/source_list.gni
@@ -1590,6 +1590,7 @@
"src/quiche/blind_sign_auth/anonymous_tokens/cpp/testing/utils.h",
"src/quiche/blind_sign_auth/blind_sign_auth.h",
"src/quiche/blind_sign_auth/blind_sign_auth_interface.h",
+ "src/quiche/blind_sign_auth/blind_sign_auth_protos.h",
"src/quiche/blind_sign_auth/blind_sign_http_interface.h",
"src/quiche/blind_sign_auth/blind_sign_http_response.h",
"src/quiche/blind_sign_auth/cached_blind_sign_auth.h",
diff --git a/build/source_list.json b/build/source_list.json
index 35fe79c..3be1a6b 100644
--- a/build/source_list.json
+++ b/build/source_list.json
@@ -1589,6 +1589,7 @@
"quiche/blind_sign_auth/anonymous_tokens/cpp/testing/utils.h",
"quiche/blind_sign_auth/blind_sign_auth.h",
"quiche/blind_sign_auth/blind_sign_auth_interface.h",
+ "quiche/blind_sign_auth/blind_sign_auth_protos.h",
"quiche/blind_sign_auth/blind_sign_http_interface.h",
"quiche/blind_sign_auth/blind_sign_http_response.h",
"quiche/blind_sign_auth/cached_blind_sign_auth.h",
diff --git a/quiche/blind_sign_auth/blind_sign_auth.cc b/quiche/blind_sign_auth/blind_sign_auth.cc
index f998154..2965ff1 100644
--- a/quiche/blind_sign_auth/blind_sign_auth.cc
+++ b/quiche/blind_sign_auth/blind_sign_auth.cc
@@ -10,11 +10,6 @@
#include <utility>
#include <vector>
-#include "quiche/blind_sign_auth/proto/auth_and_sign.pb.h"
-#include "quiche/blind_sign_auth/proto/get_initial_data.pb.h"
-#include "quiche/blind_sign_auth/proto/key_services.pb.h"
-#include "quiche/blind_sign_auth/proto/public_metadata.pb.h"
-#include "quiche/blind_sign_auth/proto/spend_token_data.pb.h"
#include "absl/functional/bind_front.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
@@ -22,7 +17,7 @@
#include "absl/strings/str_cat.h"
#include "absl/types/span.h"
#include "quiche/blind_sign_auth/anonymous_tokens/cpp/shared/proto_utils.h"
-#include "quiche/blind_sign_auth/anonymous_tokens/proto/anonymous_tokens.pb.h"
+#include "quiche/blind_sign_auth/blind_sign_auth_protos.h"
#include "quiche/blind_sign_auth/blind_sign_http_response.h"
#include "quiche/common/platform/api/quiche_logging.h"
#include "quiche/common/quiche_endian.h"
diff --git a/quiche/blind_sign_auth/blind_sign_auth.h b/quiche/blind_sign_auth/blind_sign_auth.h
index cfedeca..0a617f7 100644
--- a/quiche/blind_sign_auth/blind_sign_auth.h
+++ b/quiche/blind_sign_auth/blind_sign_auth.h
@@ -8,13 +8,12 @@
#include <memory>
#include <string>
-#include "quiche/blind_sign_auth/proto/public_metadata.pb.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/time/time.h"
#include "quiche/blind_sign_auth/anonymous_tokens/cpp/client/anonymous_tokens_rsa_bssa_client.h"
-#include "quiche/blind_sign_auth/anonymous_tokens/proto/anonymous_tokens.pb.h"
#include "quiche/blind_sign_auth/blind_sign_auth_interface.h"
+#include "quiche/blind_sign_auth/blind_sign_auth_protos.h"
#include "quiche/blind_sign_auth/blind_sign_http_interface.h"
#include "quiche/blind_sign_auth/blind_sign_http_response.h"
#include "quiche/common/platform/api/quiche_export.h"
diff --git a/quiche/blind_sign_auth/blind_sign_auth_protos.h b/quiche/blind_sign_auth/blind_sign_auth_protos.h
new file mode 100644
index 0000000..8d6ff8d
--- /dev/null
+++ b/quiche/blind_sign_auth/blind_sign_auth_protos.h
@@ -0,0 +1,12 @@
+#ifndef QUICHE_BLIND_SIGN_AUTH_BLIND_SIGN_AUTH_PROTOS_H_
+#define QUICHE_BLIND_SIGN_AUTH_BLIND_SIGN_AUTH_PROTOS_H_
+
+#include "quiche/blind_sign_auth/proto/timestamp.pb.h" // IWYU pragma: export
+#include "quiche/blind_sign_auth/proto/auth_and_sign.pb.h" // IWYU pragma: export
+#include "quiche/blind_sign_auth/proto/get_initial_data.pb.h" // IWYU pragma: export
+#include "quiche/blind_sign_auth/proto/key_services.pb.h" // IWYU pragma: export
+#include "quiche/blind_sign_auth/proto/public_metadata.pb.h" // IWYU pragma: export
+#include "quiche/blind_sign_auth/proto/spend_token_data.pb.h" // IWYU pragma: export
+#include "quiche/blind_sign_auth/anonymous_tokens/proto/anonymous_tokens.pb.h" // IWYU pragma: export
+
+#endif // QUICHE_BLIND_SIGN_AUTH_BLIND_SIGN_AUTH_PROTOS_H_
diff --git a/quiche/blind_sign_auth/blind_sign_auth_test.cc b/quiche/blind_sign_auth/blind_sign_auth_test.cc
index edd8626..56d028c 100644
--- a/quiche/blind_sign_auth/blind_sign_auth_test.cc
+++ b/quiche/blind_sign_auth/blind_sign_auth_test.cc
@@ -8,12 +8,6 @@
#include <string>
#include <utility>
-#include "quiche/blind_sign_auth/proto/timestamp.pb.h"
-#include "quiche/blind_sign_auth/proto/auth_and_sign.pb.h"
-#include "quiche/blind_sign_auth/proto/get_initial_data.pb.h"
-#include "quiche/blind_sign_auth/proto/key_services.pb.h"
-#include "quiche/blind_sign_auth/proto/public_metadata.pb.h"
-#include "quiche/blind_sign_auth/proto/spend_token_data.pb.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/escaping.h"
@@ -21,8 +15,8 @@
#include "absl/time/time.h"
#include "quiche/blind_sign_auth/anonymous_tokens/cpp/testing/proto_utils.h"
#include "quiche/blind_sign_auth/anonymous_tokens/cpp/testing/utils.h"
-#include "quiche/blind_sign_auth/anonymous_tokens/proto/anonymous_tokens.pb.h"
#include "openssl/base.h"
+#include "quiche/blind_sign_auth/blind_sign_auth_protos.h"
#include "quiche/blind_sign_auth/blind_sign_http_interface.h"
#include "quiche/blind_sign_auth/blind_sign_http_response.h"
#include "quiche/blind_sign_auth/test_tools/mock_blind_sign_http_interface.h"
