From 4a8d97ff5ea4663aef359d5293d036e6cb70b408 Mon Sep 17 00:00:00 2001 From: Francis Tsui Date: Mon, 24 Jun 2024 13:33:46 -0700 Subject: [PATCH] Rename share_target_info files to share_session. PiperOrigin-RevId: 646204158 --- sharing/BUILD | 40 +++++++++---------- ...rget_info.cc => incoming_share_session.cc} | 4 +- ...target_info.h => incoming_share_session.h} | 8 ++-- ...test.cc => incoming_share_session_test.cc} | 2 +- sharing/nearby_sharing_service_impl.cc | 6 +-- sharing/nearby_sharing_service_impl.h | 6 +-- sharing/nearby_sharing_service_impl_test.cc | 2 +- ...rget_info.cc => outgoing_share_session.cc} | 4 +- ...target_info.h => outgoing_share_session.h} | 8 ++-- ...test.cc => outgoing_share_session_test.cc} | 2 +- ...{share_target_info.cc => share_session.cc} | 2 +- .../{share_target_info.h => share_session.h} | 6 +-- ...get_info_test.cc => share_session_test.cc} | 2 +- 13 files changed, 46 insertions(+), 46 deletions(-) rename sharing/{incoming_share_target_info.cc => incoming_share_session.cc} (99%) rename sharing/{incoming_share_target_info.h => incoming_share_session.h} (92%) rename sharing/{incoming_share_target_info_test.cc => incoming_share_session_test.cc} (99%) rename sharing/{outgoing_share_target_info.cc => outgoing_share_session.cc} (99%) rename sharing/{outgoing_share_target_info.h => outgoing_share_session.h} (95%) rename sharing/{outgoing_share_target_info_test.cc => outgoing_share_session_test.cc} (99%) rename sharing/{share_target_info.cc => share_session.cc} (99%) rename sharing/{share_target_info.h => share_session.h} (97%) rename sharing/{share_target_info_test.cc => share_session_test.cc} (99%) diff --git a/sharing/BUILD b/sharing/BUILD index 6c42ffd7..842ce892 100644 --- a/sharing/BUILD +++ b/sharing/BUILD @@ -168,20 +168,20 @@ cc_library( ) cc_library( - name = "share_target_info", + name = "share_session", srcs = [ - "incoming_share_target_info.cc", + "incoming_share_session.cc", "nearby_file_handler.cc", - "outgoing_share_target_info.cc", + "outgoing_share_session.cc", "payload_tracker.cc", - "share_target_info.cc", + "share_session.cc", ], hdrs = [ - "incoming_share_target_info.h", + "incoming_share_session.h", "nearby_file_handler.h", - "outgoing_share_target_info.h", + "outgoing_share_session.h", "payload_tracker.h", - "share_target_info.h", + "share_session.h", ], deps = [ ":attachments", @@ -262,7 +262,7 @@ cc_library( ":incoming_frame_reader", ":nearby_sharing_decoder_impl", ":paired_key_verification_runner", - ":share_target_info", + ":share_session", ":transfer_metadata", ":types", "//connections:core", @@ -502,7 +502,7 @@ cc_test( ":attachments", ":connection_types", ":nearby_sharing_service", - ":share_target_info", + ":share_session", ":test_support", ":transfer_metadata", ":types", @@ -572,7 +572,7 @@ cc_test( name = "nearby_file_handler_test", srcs = ["nearby_file_handler_test.cc"], deps = [ - ":share_target_info", + ":share_session", "//internal/base:files", "//internal/platform/implementation/g3", # fixdeps: keep "@com_github_protobuf_matchers//protobuf-matchers", @@ -641,7 +641,7 @@ cc_test( deps = [ ":attachments", ":connection_types", - ":share_target_info", + ":share_session", ":transfer_metadata", ":types", "//internal/platform/implementation/g3", # fixdeps: keep @@ -707,12 +707,12 @@ cc_test( ) cc_test( - name = "share_target_info_test", - srcs = ["share_target_info_test.cc"], + name = "share_session_test", + srcs = ["share_session_test.cc"], deps = [ ":nearby_sharing_decoder_impl", ":paired_key_verification_runner", - ":share_target_info", + ":share_session", ":test_support", ":transfer_metadata", ":types", @@ -751,12 +751,12 @@ cc_test( ) cc_test( - name = "outgoing_share_target_info_test", - srcs = ["outgoing_share_target_info_test.cc"], + name = "outgoing_share_session_test", + srcs = ["outgoing_share_session_test.cc"], deps = [ ":attachments", ":connection_types", - ":share_target_info", + ":share_session", ":test_support", ":transfer_metadata", ":types", @@ -771,13 +771,13 @@ cc_test( ) cc_test( - name = "incoming_share_target_info_test", - srcs = ["incoming_share_target_info_test.cc"], + name = "incoming_share_session_test", + srcs = ["incoming_share_session_test.cc"], deps = [ ":attachment_compare", ":attachments", ":connection_types", - ":share_target_info", + ":share_session", ":test_support", ":transfer_metadata", ":types", diff --git a/sharing/incoming_share_target_info.cc b/sharing/incoming_share_session.cc similarity index 99% rename from sharing/incoming_share_target_info.cc rename to sharing/incoming_share_session.cc index 4aaa0f6d..3555e526 100644 --- a/sharing/incoming_share_target_info.cc +++ b/sharing/incoming_share_session.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "sharing/incoming_share_target_info.h" +#include "sharing/incoming_share_session.h" #include #include // NOLINT @@ -36,8 +36,8 @@ #include "sharing/nearby_connections_types.h" #include "sharing/payload_tracker.h" #include "sharing/proto/wire_format.pb.h" +#include "sharing/share_session.h" #include "sharing/share_target.h" -#include "sharing/share_target_info.h" #include "sharing/text_attachment.h" #include "sharing/transfer_metadata.h" #include "sharing/wifi_credentials_attachment.h" diff --git a/sharing/incoming_share_target_info.h b/sharing/incoming_share_session.h similarity index 92% rename from sharing/incoming_share_target_info.h rename to sharing/incoming_share_session.h index 8f3ad1c5..e6e3ea56 100644 --- a/sharing/incoming_share_target_info.h +++ b/sharing/incoming_share_session.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef THIRD_PARTY_NEARBY_SHARING_INCOMING_SHARE_TARGET_INFO_H_ -#define THIRD_PARTY_NEARBY_SHARING_INCOMING_SHARE_TARGET_INFO_H_ +#ifndef THIRD_PARTY_NEARBY_SHARING_INCOMING_SHARE_SESSION_H_ +#define THIRD_PARTY_NEARBY_SHARING_INCOMING_SHARE_SESSION_H_ #include #include // NOLINT @@ -27,7 +27,7 @@ #include "sharing/nearby_connections_manager.h" #include "sharing/proto/wire_format.pb.h" #include "sharing/share_target.h" -#include "sharing/share_target_info.h" +#include "sharing/share_session.h" #include "sharing/transfer_metadata.h" namespace nearby::sharing { @@ -84,4 +84,4 @@ class IncomingShareTargetInfo : public ShareTargetInfo { } // namespace nearby::sharing -#endif // THIRD_PARTY_NEARBY_SHARING_INCOMING_SHARE_TARGET_INFO_H_ +#endif // THIRD_PARTY_NEARBY_SHARING_INCOMING_SHARE_SESSION_H_ diff --git a/sharing/incoming_share_target_info_test.cc b/sharing/incoming_share_session_test.cc similarity index 99% rename from sharing/incoming_share_target_info_test.cc rename to sharing/incoming_share_session_test.cc index 0940c4f7..92b6c326 100644 --- a/sharing/incoming_share_target_info_test.cc +++ b/sharing/incoming_share_session_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "sharing/incoming_share_target_info.h" +#include "sharing/incoming_share_session.h" #include #include // NOLINT diff --git a/sharing/nearby_sharing_service_impl.cc b/sharing/nearby_sharing_service_impl.cc index 2e411f0d..a761b8da 100644 --- a/sharing/nearby_sharing_service_impl.cc +++ b/sharing/nearby_sharing_service_impl.cc @@ -69,7 +69,7 @@ #include "sharing/file_attachment.h" #include "sharing/flags/generated/nearby_sharing_feature_flags.h" #include "sharing/incoming_frames_reader.h" -#include "sharing/incoming_share_target_info.h" +#include "sharing/incoming_share_session.h" #include "sharing/internal/api/bluetooth_adapter.h" #include "sharing/internal/api/sharing_platform.h" #include "sharing/internal/api/sharing_rpc_notifier.h" @@ -90,15 +90,15 @@ #include "sharing/nearby_sharing_service_extension.h" #include "sharing/nearby_sharing_settings.h" #include "sharing/nearby_sharing_util.h" -#include "sharing/outgoing_share_target_info.h" +#include "sharing/outgoing_share_session.h" #include "sharing/paired_key_verification_runner.h" #include "sharing/proto/encrypted_metadata.pb.h" #include "sharing/proto/enums.pb.h" #include "sharing/proto/wire_format.pb.h" #include "sharing/scheduling/nearby_share_scheduler_utils.h" +#include "sharing/share_session.h" #include "sharing/share_target.h" #include "sharing/share_target_discovered_callback.h" -#include "sharing/share_target_info.h" #include "sharing/transfer_metadata.h" #include "sharing/transfer_metadata_builder.h" #include "sharing/transfer_update_callback.h" diff --git a/sharing/nearby_sharing_service_impl.h b/sharing/nearby_sharing_service_impl.h index 707b67ea..c3faf8fe 100644 --- a/sharing/nearby_sharing_service_impl.h +++ b/sharing/nearby_sharing_service_impl.h @@ -51,7 +51,7 @@ #include "sharing/common/nearby_share_enums.h" #include "sharing/common/nearby_share_profile_info_provider.h" #include "sharing/fast_initiation/nearby_fast_initiation.h" -#include "sharing/incoming_share_target_info.h" +#include "sharing/incoming_share_session.h" #include "sharing/internal/api/app_info.h" #include "sharing/internal/api/bluetooth_adapter.h" #include "sharing/internal/api/preference_manager.h" @@ -70,13 +70,13 @@ #include "sharing/nearby_sharing_service.h" #include "sharing/nearby_sharing_service_extension.h" #include "sharing/nearby_sharing_settings.h" -#include "sharing/outgoing_share_target_info.h" +#include "sharing/outgoing_share_session.h" #include "sharing/paired_key_verification_runner.h" #include "sharing/proto/enums.pb.h" #include "sharing/proto/wire_format.pb.h" +#include "sharing/share_session.h" #include "sharing/share_target.h" #include "sharing/share_target_discovered_callback.h" -#include "sharing/share_target_info.h" #include "sharing/transfer_metadata.h" #include "sharing/transfer_update_callback.h" #include "sharing/wrapped_share_target_discovered_callback.h" diff --git a/sharing/nearby_sharing_service_impl_test.cc b/sharing/nearby_sharing_service_impl_test.cc index 9b922884..1806eb7f 100644 --- a/sharing/nearby_sharing_service_impl_test.cc +++ b/sharing/nearby_sharing_service_impl_test.cc @@ -64,7 +64,7 @@ #include "sharing/fast_initiation/nearby_fast_initiation_impl.h" #include "sharing/file_attachment.h" #include "sharing/flags/generated/nearby_sharing_feature_flags.h" -#include "sharing/incoming_share_target_info.h" +#include "sharing/incoming_share_session.h" #include "sharing/internal/api/mock_app_info.h" #include "sharing/internal/api/mock_sharing_platform.h" #include "sharing/internal/api/preference_manager.h" diff --git a/sharing/outgoing_share_target_info.cc b/sharing/outgoing_share_session.cc similarity index 99% rename from sharing/outgoing_share_target_info.cc rename to sharing/outgoing_share_session.cc index 49b0e3e6..02124526 100644 --- a/sharing/outgoing_share_target_info.cc +++ b/sharing/outgoing_share_session.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "sharing/outgoing_share_target_info.h" +#include "sharing/outgoing_share_session.h" #include #include @@ -34,8 +34,8 @@ #include "sharing/nearby_connections_types.h" #include "sharing/nearby_file_handler.h" #include "sharing/payload_tracker.h" +#include "sharing/share_session.h" #include "sharing/share_target.h" -#include "sharing/share_target_info.h" #include "sharing/text_attachment.h" #include "sharing/transfer_metadata.h" #include "sharing/wifi_credentials_attachment.h" diff --git a/sharing/outgoing_share_target_info.h b/sharing/outgoing_share_session.h similarity index 95% rename from sharing/outgoing_share_target_info.h rename to sharing/outgoing_share_session.h index f80c12fd..a7a67c88 100644 --- a/sharing/outgoing_share_target_info.h +++ b/sharing/outgoing_share_session.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef THIRD_PARTY_NEARBY_SHARING_OUTGOING_SHARE_TARGET_INFO_H_ -#define THIRD_PARTY_NEARBY_SHARING_OUTGOING_SHARE_TARGET_INFO_H_ +#ifndef THIRD_PARTY_NEARBY_SHARING_OUTGOING_SHARE_SESSION_H_ +#define THIRD_PARTY_NEARBY_SHARING_OUTGOING_SHARE_SESSION_H_ #include #include // NOLINT @@ -28,8 +28,8 @@ #include "sharing/nearby_connections_manager.h" #include "sharing/nearby_connections_types.h" #include "sharing/nearby_file_handler.h" +#include "sharing/share_session.h" #include "sharing/share_target.h" -#include "sharing/share_target_info.h" #include "sharing/transfer_metadata.h" namespace nearby::sharing { @@ -125,4 +125,4 @@ class OutgoingShareTargetInfo : public ShareTargetInfo { } // namespace nearby::sharing -#endif // THIRD_PARTY_NEARBY_SHARING_OUTGOING_SHARE_TARGET_INFO_H_ +#endif // THIRD_PARTY_NEARBY_SHARING_OUTGOING_SHARE_SESSION_H_ diff --git a/sharing/outgoing_share_target_info_test.cc b/sharing/outgoing_share_session_test.cc similarity index 99% rename from sharing/outgoing_share_target_info_test.cc rename to sharing/outgoing_share_session_test.cc index d3a63a3f..23e81e6f 100644 --- a/sharing/outgoing_share_target_info_test.cc +++ b/sharing/outgoing_share_session_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "sharing/outgoing_share_target_info.h" +#include "sharing/outgoing_share_session.h" #include #include diff --git a/sharing/share_target_info.cc b/sharing/share_session.cc similarity index 99% rename from sharing/share_target_info.cc rename to sharing/share_session.cc index a022ed77..02082a15 100644 --- a/sharing/share_target_info.cc +++ b/sharing/share_session.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "sharing/share_target_info.h" +#include "sharing/share_session.h" #include #include diff --git a/sharing/share_target_info.h b/sharing/share_session.h similarity index 97% rename from sharing/share_target_info.h rename to sharing/share_session.h index 4c45292f..eed9e90a 100644 --- a/sharing/share_target_info.h +++ b/sharing/share_session.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef THIRD_PARTY_NEARBY_SHARING_SHARE_TARGET_INFO_H_ -#define THIRD_PARTY_NEARBY_SHARING_SHARE_TARGET_INFO_H_ +#ifndef THIRD_PARTY_NEARBY_SHARING_SHARE_SESSION_H_ +#define THIRD_PARTY_NEARBY_SHARING_SHARE_SESSION_H_ #include #include @@ -183,4 +183,4 @@ class ShareTargetInfo { } // namespace nearby::sharing -#endif // THIRD_PARTY_NEARBY_SHARING_SHARE_TARGET_INFO_H_ +#endif // THIRD_PARTY_NEARBY_SHARING_SHARE_SESSION_H_ diff --git a/sharing/share_target_info_test.cc b/sharing/share_session_test.cc similarity index 99% rename from sharing/share_target_info_test.cc rename to sharing/share_session_test.cc index 593bbc6a..94a6df57 100644 --- a/sharing/share_target_info_test.cc +++ b/sharing/share_session_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "sharing/share_target_info.h" +#include "sharing/share_session.h" #include #include