cleanup

PiperOrigin-RevId: 658887170

sharing/certificates/test_util.cc

@@ -20,17 +20,19 @@
 #include <array>
 #include <memory>
 #include <set>
+#include <string>
 #include <vector>
 
 #include "absl/time/time.h"
 #include "absl/types/span.h"
 #include "internal/base/bluetooth_address.h"
+#include "internal/crypto_cros/ec_private_key.h"
+#include "internal/crypto_cros/symmetric_key.h"
 #include "sharing/certificates/common.h"
 #include "sharing/certificates/constants.h"
 #include "sharing/certificates/nearby_share_decrypted_public_certificate.h"
 #include "sharing/certificates/nearby_share_encrypted_metadata_key.h"
 #include "sharing/certificates/nearby_share_private_certificate.h"
-#include "sharing/common/nearby_share_enums.h"
 #include "sharing/proto/encrypted_metadata.pb.h"
 #include "sharing/proto/rpc_resources.pb.h"
 #include "sharing/proto/timestamp.pb.h"
@@ -309,6 +311,7 @@ nearby::sharing::proto::PublicCertificate GetNearbyShareTestPublicCertificate(
 std::vector<NearbySharePrivateCertificate>
 GetNearbyShareTestPrivateCertificateList(DeviceVisibility visibility) {
   std::vector<NearbySharePrivateCertificate> list;
+  list.reserve(kNearbyShareNumPrivateCertificates);
   for (size_t i = 0; i < kNearbyShareNumPrivateCertificates; ++i) {
     list.push_back(GetNearbyShareTestPrivateCertificate(
         visibility, GetNearbyShareTestNotBefore() +
@@ -320,6 +323,7 @@ GetNearbyShareTestPrivateCertificateList(DeviceVisibility visibility) {
 std::vector<nearby::sharing::proto::PublicCertificate>
 GetNearbyShareTestPublicCertificateList(DeviceVisibility visibility) {
   std::vector<nearby::sharing::proto::PublicCertificate> list;
+  list.reserve(kNearbyShareNumPrivateCertificates);
   for (size_t i = 0; i < kNearbyShareNumPrivateCertificates; ++i) {
     list.push_back(GetNearbyShareTestPublicCertificate(
         visibility, GetNearbyShareTestNotBefore() +

sharing/incoming_frames_reader.cc

@@ -20,9 +20,7 @@
 #include <map>
 #include <memory>
 #include <optional>
-#include <ostream>
 #include <queue>
-#include <type_traits>
 #include <utility>
 #include <vector>
 
@@ -44,11 +42,6 @@ using FrameType = ::nearby::sharing::service::proto::V1Frame_FrameType;
 using V1Frame = ::nearby::sharing::service::proto::V1Frame;
 using Frame = ::nearby::sharing::service::proto::Frame;
 
-std::ostream& operator<<(std::ostream& out, const FrameType& obj) {
-  out << static_cast<std::underlying_type<FrameType>::type>(obj);
-  return out;
-}
-
 }  // namespace
 
 IncomingFramesReader::IncomingFramesReader(TaskRunner& service_thread,

sharing/nearby_connections_service.cc

@@ -37,7 +37,7 @@ Status ConvertToStatus(NcStatus status) {
 Payload ConvertToPayload(NcPayload payload) {
   switch (payload.GetType()) {
     case NcPayloadType::kBytes: {
-      NcByteArray bytes = payload.AsBytes();
+      const NcByteArray& bytes = payload.AsBytes();
       std::string data = std::string(bytes);
       return Payload(payload.GetId(),
                      std::vector<uint8_t>(data.begin(), data.end()));

sharing/nearby_sharing_settings_test.cc

@@ -79,12 +79,12 @@ class FakeNearbyShareSettingsObserver : public NearbyShareSettings::Observer {
     return is_fast_initiation_notification_hardware_supported_;
   }
 
-  const std::string& device_name() const {
+  std::string device_name() const {
     absl::MutexLock lock(&mutex_);
     return device_name_;
   }
 
-  const std::string& custom_save_path() const {
+  std::string custom_save_path() const {
     absl::MutexLock lock(&mutex_);
     return custom_save_path_;
   }

sharing/paired_key_verification_runner_test.cc

@@ -222,8 +222,7 @@ class PairedKeyVerificationRunnerTest : public testing::Test {
                 ReadFrame(testing::Eq(V1Frame::PAIRED_KEY_ENCRYPTION),
                           testing::_, testing::Eq(kTimeout)))
         .WillOnce(testing::WithArg<1>(testing::Invoke(
-            [this,
-             frame_type](std::function<void(std::optional<V1Frame>)> callback) {
+            [frame_type](std::function<void(std::optional<V1Frame>)> callback) {
               if (frame_type == ReturnFrameType::kNull) {
                 std::move(callback)(std::nullopt);
                 return;