Migrates callers of migrated proto code

PiperOrigin-RevId: 486801954

Author: tfx-copybara

struct2tensor/benchmarks/serialization_benchmark.cc

@@ -43,13 +43,13 @@ BM_SerializeFlatProto/100/100      53926          53725           1000 860.641MB
 
 #include <iostream>
 
-#include "google/protobuf/descriptor.h"
-#include "google/protobuf/message.h"
 #include "testing/base/public/benchmark.h"
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
 #include "absl/random/distributions.h"
 #include "absl/random/random.h"
+#include "google/protobuf/descriptor.h"
+#include "google/protobuf/message.h"
 #include "struct2tensor/benchmarks/benchmark.pb.h"
 #include "tensorflow/core/example/example.pb.h"
 #include "tensorflow/core/example/feature_util.h"

struct2tensor/kernels/BUILD

@@ -46,16 +46,11 @@ cc_library(
     ],
     deps = [
         ":vector_to_tensor",
-        "@com_google_absl//absl/base:core_headers",
-        "@com_google_absl//absl/flags:flag",
         "@com_google_absl//absl/memory",
-        "@com_google_protobuf//:cc_wkt_protos",
         "@com_google_protobuf//:protobuf",
-        "@com_google_protobuf//:protobuf_lite",
         "@org_tensorflow//tensorflow/core:framework",
         "@org_tensorflow//tensorflow/core:framework_lite",
         "@org_tensorflow//tensorflow/core:lib",
-        "@org_tensorflow//tensorflow/core/util/proto:descriptors",
     ],
     alwayslink = 1,
 )
@@ -87,7 +82,6 @@ cc_library(
         "@com_google_absl//absl/container:flat_hash_map",
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/types:span",
-        "@com_google_protobuf//:cc_wkt_protos",
         "@com_google_protobuf//:protobuf",
         "@org_tensorflow//tensorflow/core:framework",
         "@org_tensorflow//tensorflow/core:lib",
@@ -175,7 +169,6 @@ cc_library(
         "@com_google_absl//absl/base:endian",
         "@com_google_absl//absl/strings",
         "@com_google_protobuf//:protobuf",
-        "@org_tensorflow//tensorflow/core:framework",
         "@org_tensorflow//tensorflow/core:framework_lite",
         "@org_tensorflow//tensorflow/core:lib",
     ],

struct2tensor/kernels/decode_proto_map_op.cc

@@ -39,12 +39,12 @@ limitations under the License.
 #include <memory>
 #include <vector>
 
-#include "google/protobuf/descriptor.pb.h"
-#include "google/protobuf/descriptor.h"
 #include "absl/container/flat_hash_map.h"
 #include "absl/strings/numbers.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/span.h"
+#include "google/protobuf/compiler/parser.h"
+#include "google/protobuf/descriptor.h"
 #include "struct2tensor/kernels/streaming_proto_reader.h"
 #include "struct2tensor/kernels/vector_to_tensor.h"
 #include "tensorflow/core/framework/op_kernel.h"

struct2tensor/kernels/decode_proto_sparse_op.cc

@@ -34,15 +34,15 @@ limitations under the License.
 #include <utility>
 #include <vector>
 
-#include "google/protobuf/io/coded_stream.h"
-#include "google/protobuf/descriptor.pb.h"
+#include "absl/memory/memory.h"
+#include "google/protobuf/compiler/parser.h"
 #include "google/protobuf/descriptor.h"
 #include "google/protobuf/descriptor_database.h"
 #include "google/protobuf/dynamic_message.h"
+#include "google/protobuf/io/coded_stream.h"
 #include "google/protobuf/message.h"
 #include "google/protobuf/text_format.h"
 #include "google/protobuf/wire_format.h"
-#include "absl/memory/memory.h"
 #include "struct2tensor/kernels/vector_to_tensor.h"
 #include "tensorflow/core/framework/op_kernel.h"
 #include "tensorflow/core/framework/tensor_types.h"

struct2tensor/kernels/streaming_proto_reader.cc

@@ -14,9 +14,9 @@ limitations under the License.
 ==============================================================================*/
 #include "struct2tensor/kernels/streaming_proto_reader.h"
 
-#include "google/protobuf/wire_format_lite.h"
 
 #include "absl/strings/string_view.h"
+#include "google/protobuf/wire_format_lite.h"
 #include "tensorflow/core/lib/core/coding.h"
 
 namespace struct2tensor {

struct2tensor/kernels/streaming_proto_reader.h

@@ -20,12 +20,12 @@ limitations under the License.
 //
 // LOG and CHECK free.
 
-#include "google/protobuf/descriptor.h"
-#include "google/protobuf/message.h"
-#include "google/protobuf/wire_format_lite.h"
 
 #include "absl/base/internal/endian.h"
 #include "absl/strings/string_view.h"
+#include "google/protobuf/descriptor.h"
+#include "google/protobuf/message.h"
+#include "google/protobuf/wire_format_lite.h"
 #include "tensorflow/core/lib/core/coding.h"
 #include "tensorflow/core/platform/types.h"