[Nearby] Pass visibility to private cert test helper

Constructs a test private certificate with the input visibility. This
will be useful for certificate manager fakes and unit tests that
require certificates with different visibilities.

Change-Id: Ibd3e71d51d06e38c4029a6dbfc3653cc57dbef97
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2311048
Commit-Queue: James Vecore <vecore@google.com>
Auto-Submit: Josh Nohle <nohle@chromium.org>
Reviewed-by: James Vecore <vecore@google.com>
Cr-Commit-Position: refs/heads/master@{#790872}

chrome/browser/nearby_sharing/certificates/common_unittest.cc

@@ -10,7 +10,8 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 TEST(NearbyShareCertificatesCommonTest, ValidityPeriod_PrivateCertificate) {
-  NearbySharePrivateCertificate cert = GetNearbyShareTestPrivateCertificate();
+  NearbySharePrivateCertificate cert =
+      GetNearbyShareTestPrivateCertificate(NearbyShareVisibility::kAllContacts);
   const bool use_public_certificate_tolerance = false;
 
   // Set time before validity period.

chrome/browser/nearby_sharing/certificates/nearby_share_private_certificate_unittest.cc

@@ -71,7 +71,7 @@ TEST(NearbySharePrivateCertificateTest, EncryptMetadataKey) {
 
 TEST(NearbySharePrivateCertificateTest, EncryptMetadataKey_FixedData) {
   NearbySharePrivateCertificate private_certificate =
-      GetNearbyShareTestPrivateCertificate();
+      GetNearbyShareTestPrivateCertificate(NearbyShareVisibility::kAllContacts);
   base::Optional<NearbyShareEncryptedMetadataKey> encrypted_metadata_key =
       private_certificate.EncryptMetadataKey();
   EXPECT_EQ(GetNearbyShareTestEncryptedMetadataKey().encrypted_key(),
@@ -83,7 +83,7 @@ TEST(NearbySharePrivateCertificateTest, EncryptMetadataKey_FixedData) {
 TEST(NearbySharePrivateCertificateTest,
      EncryptMetadataKey_SaltsExhaustedFailure) {
   NearbySharePrivateCertificate private_certificate =
-      GetNearbyShareTestPrivateCertificate();
+      GetNearbyShareTestPrivateCertificate(NearbyShareVisibility::kAllContacts);
   for (size_t i = 0; i < kNearbyShareMaxNumMetadataEncryptionKeySalts; ++i) {
     EXPECT_TRUE(private_certificate.EncryptMetadataKey());
   }
@@ -93,7 +93,7 @@ TEST(NearbySharePrivateCertificateTest,
 TEST(NearbySharePrivateCertificateTest,
      EncryptMetadataKey_TooManySaltGenerationRetriesFailure) {
   NearbySharePrivateCertificate private_certificate =
-      GetNearbyShareTestPrivateCertificate();
+      GetNearbyShareTestPrivateCertificate(NearbyShareVisibility::kAllContacts);
   EXPECT_TRUE(private_certificate.EncryptMetadataKey());
   while (private_certificate.next_salts_for_testing().size() <
          kNearbyShareMaxNumMetadataEncryptionKeySaltGenerationRetries) {
@@ -104,7 +104,7 @@ TEST(NearbySharePrivateCertificateTest,
 
 TEST(NearbySharePrivateCertificateTest, PublicCertificateConversion) {
   NearbySharePrivateCertificate private_certificate =
-      GetNearbyShareTestPrivateCertificate();
+      GetNearbyShareTestPrivateCertificate(NearbyShareVisibility::kAllContacts);
   private_certificate.offset_for_testing() = GetNearbyShareTestValidityOffset();
   base::Optional<nearbyshare::proto::PublicCertificate> public_certificate =
       private_certificate.ToPublicCertificate();
@@ -115,7 +115,7 @@ TEST(NearbySharePrivateCertificateTest, PublicCertificateConversion) {
 
 TEST(NearbySharePrivateCertificateTest, EncryptDecryptRoundtrip) {
   NearbySharePrivateCertificate private_certificate =
-      GetNearbyShareTestPrivateCertificate();
+      GetNearbyShareTestPrivateCertificate(NearbyShareVisibility::kAllContacts);
 
   base::Optional<NearbyShareDecryptedPublicCertificate>
       decrypted_public_certificate =
@@ -130,7 +130,7 @@ TEST(NearbySharePrivateCertificateTest, EncryptDecryptRoundtrip) {
 
 TEST(NearbySharePrivateCertificateTest, SignVerifyRoundtrip) {
   NearbySharePrivateCertificate private_certificate =
-      GetNearbyShareTestPrivateCertificate();
+      GetNearbyShareTestPrivateCertificate(NearbyShareVisibility::kAllContacts);
   base::Optional<std::vector<uint8_t>> signature =
       private_certificate.Sign(GetNearbyShareTestPayloadToSign());
   ASSERT_TRUE(signature);

chrome/browser/nearby_sharing/certificates/test_util.cc

@@ -212,9 +212,10 @@ const std::vector<uint8_t>& GetNearbyShareTestSampleSignature() {
   return *signature;
 }
 
-NearbySharePrivateCertificate GetNearbyShareTestPrivateCertificate() {
+NearbySharePrivateCertificate GetNearbyShareTestPrivateCertificate(
+    NearbyShareVisibility visibility) {
   NearbySharePrivateCertificate cert(
-      NearbyShareVisibility::kAllContacts, GetNearbyShareTestNotBefore(),
+      visibility, GetNearbyShareTestNotBefore(),
       GetNearbyShareTestNotBefore() + kNearbyShareCertificateValidityPeriod,
       GetNearbyShareTestP256KeyPair(), GetNearbyShareTestSecretKey(),
       GetNearbyShareTestMetadataEncryptionKey(),

chrome/browser/nearby_sharing/certificates/test_util.h

@@ -36,7 +36,9 @@ const std::vector<uint8_t>& GetNearbyShareTestEncryptedMetadata();
 const std::vector<uint8_t>& GetNearbyShareTestPayloadToSign();
 const std::vector<uint8_t>& GetNearbyShareTestSampleSignature();
 
-NearbySharePrivateCertificate GetNearbyShareTestPrivateCertificate();
+NearbySharePrivateCertificate GetNearbyShareTestPrivateCertificate(
+    NearbyShareVisibility visibility);
+
 const nearbyshare::proto::PublicCertificate&
 GetNearbyShareTestPublicCertificate();