Internal change to GRPC dependency structure

PiperOrigin-RevId: 393891207

tensorflow_federated/cc/core/impl/executor_stacks/executor_stack_bindings.cc

@@ -15,8 +15,8 @@ limitations under the License
 
 #include <memory>
 
-#include "grpcpp/grpcpp.h"
 #include "absl/types/span.h"
+#include "grpcpp/grpcpp.h"
 #include "pybind11/include/pybind11/detail/common.h"
 #include "pybind11/include/pybind11/pybind11.h"
 #include "pybind11/include/pybind11/stl.h"

tensorflow_federated/cc/core/impl/executor_stacks/remote_stacks.cc

@@ -19,11 +19,11 @@ limitations under the License
 #include <limits>
 #include <memory>
 
-#include "grpcpp/grpcpp.h"
-#include "net/grpc/public/include/grpcpp/support/time.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "absl/time/time.h"
+#include "grpcpp/grpcpp.h"
+#include "grpc/include/grpcpp/support/time.h"
 #include "tensorflow_federated/cc/core/impl/executors/cardinalities.h"
 #include "tensorflow_federated/cc/core/impl/executors/composing_executor.h"
 #include "tensorflow_federated/cc/core/impl/executors/federating_executor.h"

tensorflow_federated/cc/core/impl/executor_stacks/remote_stacks.h

@@ -16,8 +16,8 @@ limitations under the License
 #ifndef THIRD_PARTY_TENSORFLOW_FEDERATED_CC_CORE_IMPL_EXECUTOR_STACKS_REMOTE_STACKS_H_
 #define THIRD_PARTY_TENSORFLOW_FEDERATED_CC_CORE_IMPL_EXECUTOR_STACKS_REMOTE_STACKS_H_
 
-#include "grpcpp/grpcpp.h"
 #include "absl/strings/string_view.h"
+#include "grpcpp/grpcpp.h"
 #include "tensorflow_federated/cc/core/impl/executors/cardinalities.h"
 #include "tensorflow_federated/cc/core/impl/executors/composing_executor.h"
 #include "tensorflow_federated/cc/core/impl/executors/executor.h"

tensorflow_federated/cc/core/impl/executor_stacks/remote_stacks_test.cc

@@ -17,9 +17,9 @@ limitations under the License
 
 #include <memory>
 
-#include "grpcpp/grpcpp.h"
 #include "googlemock/include/gmock/gmock.h"
 #include "googletest/include/gtest/gtest.h"
+#include "grpcpp/grpcpp.h"
 #include "tensorflow_federated/cc/core/impl/executors/cardinalities.h"
 #include "tensorflow_federated/cc/core/impl/executors/executor.h"
 #include "tensorflow_federated/cc/core/impl/executors/mock_executor.h"

tensorflow_federated/cc/core/impl/executors/executor_service.h

@@ -19,13 +19,13 @@ limitations under the License
 #include <memory>
 #include <utility>
 
-#include "grpcpp/grpcpp.h"
 #include "absl/container/flat_hash_map.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/numbers.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/substitute.h"
+#include "grpcpp/grpcpp.h"
 #include "tensorflow_federated/cc/core/impl/executors/cardinalities.h"
 #include "tensorflow_federated/cc/core/impl/executors/executor.h"
 #include "tensorflow_federated/proto/v0/computation.pb.h"

tensorflow_federated/cc/core/impl/executors/executor_service_test.cc

@@ -18,11 +18,11 @@ limitations under the License
 #include <memory>
 #include <optional>
 
-#include "grpcpp/grpcpp.h"
 #include "googlemock/include/gmock/gmock.h"
 #include "googletest/include/gtest/gtest.h"
 #include "absl/container/flat_hash_map.h"
 #include "absl/status/status.h"
+#include "grpcpp/grpcpp.h"
 #include "tensorflow/core/framework/tensor.h"
 #include "tensorflow/core/framework/tensor.pb.h"
 #include "tensorflow_federated/cc/core/impl/executors/executor.h"

tensorflow_federated/cc/core/impl/executors/mock_grpc.h

@@ -16,8 +16,8 @@ limitations under the License
 #ifndef THIRD_PARTY_TENSORFLOW_FEDERATED_CC_CORE_IMPL_EXECUTORS_MOCK_GRPC_H_
 #define THIRD_PARTY_TENSORFLOW_FEDERATED_CC_CORE_IMPL_EXECUTORS_MOCK_GRPC_H_
 
-#include "grpcpp/grpcpp.h"
 #include "googlemock/include/gmock/gmock.h"
+#include "grpcpp/grpcpp.h"
 #include "tensorflow_federated/proto/v0/executor.grpc.pb.h"
 #include "tensorflow_federated/proto/v0/executor.pb.h"
 

tensorflow_federated/cc/core/impl/executors/remote_executor.cc

@@ -19,9 +19,9 @@ limitations under the License
 #include <memory>
 #include <variant>
 
-#include "grpcpp/grpcpp.h"
 #include "absl/status/status.h"
 #include "absl/synchronization/mutex.h"
+#include "grpcpp/grpcpp.h"
 #include "tensorflow_federated/cc/core/impl/executors/cardinalities.h"
 #include "tensorflow_federated/cc/core/impl/executors/status_macros.h"
 #include "tensorflow_federated/cc/core/impl/executors/threading.h"