[DeviceSync v2] Remove references to IID tokens for DeviceSync v2

CryptAuth decided it will only use one Instance ID token: the one
corresponding to CryptAuth v2 Enrollment.

Bug: 990430
Change-Id: I663a0c337ddc061ec8607eda0b0d014437d97ee4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1866992Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Commit-Queue: Josh Nohle <nohle@chromium.org>
Cr-Commit-Position: refs/heads/master@{#708640}

chromeos/services/device_sync/cryptauth_device_activity_getter_impl.cc

@@ -142,10 +142,6 @@ void CryptAuthDeviceActivityGetterImpl::OnClientAppMetadataFetched(
           CryptAuthKeyBundle::Name::kDeviceSyncBetterTogether));
   request.mutable_context()->set_device_id(
       client_app_metadata.value().instance_id());
-
-  // TODO(https://crbug.com/990430): This is the IID token for the v2 Enrollment
-  // service. A different IID token for the v2 DeviceSync service will be
-  // necessary.
   request.mutable_context()->set_device_id_token(
       client_app_metadata.value().instance_id_token());
 

chromeos/services/device_sync/cryptauth_device_syncer_impl.cc

@@ -146,10 +146,6 @@ void CryptAuthDeviceSyncerImpl::OnAttemptStarted(
       CryptAuthKeyBundle::Name::kDeviceSyncBetterTogether));
   request_context_.mutable_client_metadata()->CopyFrom(client_metadata);
   request_context_.set_device_id(client_app_metadata.instance_id());
-
-  // TODO(https://crbug.com/990430): This is the IID token for the v2 Enrollment
-  // service. A different IID token for the v2 DeviceSync service will be
-  // necessary.
   request_context_.set_device_id_token(client_app_metadata.instance_id_token());
 
   const CryptAuthKey* user_key_pair =

chromeos/services/device_sync/cryptauth_feature_status_setter_impl.cc

@@ -203,10 +203,6 @@ void CryptAuthFeatureStatusSetterImpl::ProcessRequestQueue() {
   request.mutable_context()->mutable_client_metadata()->set_invocation_reason(
       cryptauthv2::ClientMetadata::FEATURE_TOGGLED);
   request.mutable_context()->set_device_id(client_app_metadata_->instance_id());
-
-  // TODO(https://crbug.com/990430): This is the IID token for the v2 Enrollment
-  // service. A different IID token for the v2 DeviceSync service might be
-  // necessary.
   request.mutable_context()->set_device_id_token(
       client_app_metadata_->instance_id_token());
 

chromeos/services/device_sync/public/cpp/gcm_constants.cc

@@ -11,7 +11,6 @@ namespace device_sync {
 const char kCryptAuthGcmAppId[] = "com.google.chrome.cryptauth";
 const char kCryptAuthGcmSenderId[] = "381449029288";
 const char kCryptAuthV2EnrollmentAuthorizedEntity[] = "16502139086";
-const char kCryptAuthV2DeviceSyncAuthorizedEntity[] = "302798585788";
 
 }  // namespace device_sync
 

chromeos/services/device_sync/public/cpp/gcm_constants.h

@@ -13,7 +13,6 @@ namespace device_sync {
 extern const char kCryptAuthGcmAppId[];
 extern const char kCryptAuthGcmSenderId[];
 extern const char kCryptAuthV2EnrollmentAuthorizedEntity[];
-extern const char kCryptAuthV2DeviceSyncAuthorizedEntity[];
 
 }  // namespace device_sync