[Fuchsia] Switch back to key_id

Now that the soft transition of fuchsia.media/KeyId to a bytes field is
complete for key_id, we can revert back to using key_id instead of
key_id_temp in EncryptedFormat.

Bug: fxb/38522
Change-Id: I86092467213964bed965561fe0b663bc7d5fc411
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1893677Reviewed-by: Yuchen Liu <yucliu@chromium.org>
Reviewed-by: David Dorwin <ddorwin@chromium.org>
Commit-Queue: RJ Ascani <rjascani@google.com>
Cr-Commit-Position: refs/heads/master@{#711365}

media/fuchsia/cdm/fuchsia_stream_decryptor.cc

@@ -69,8 +69,8 @@ fuchsia::media::FormatDetails GetClearFormatDetails(
     const std::string& placeholder_key_id) {
   fuchsia::media::EncryptedFormat encrypted_format;
   encrypted_format.set_scheme(fuchsia::media::ENCRYPTION_SCHEME_CENC)
-      .set_key_id_temp(std::vector<uint8_t>(placeholder_key_id.begin(),
-                                            placeholder_key_id.end()))
+      .set_key_id(std::vector<uint8_t>(placeholder_key_id.begin(),
+                                       placeholder_key_id.end()))
       .set_init_vector(std::vector<uint8_t>(DecryptConfig::kDecryptionKeySize));
 
   std::vector<fuchsia::media::SubsampleEntry> subsamples(1);
@@ -90,8 +90,8 @@ fuchsia::media::FormatDetails GetEncryptedFormatDetails(
 
   fuchsia::media::EncryptedFormat encrypted_format;
   encrypted_format.set_scheme(GetEncryptionScheme(config->encryption_mode()))
-      .set_key_id_temp(std::vector<uint8_t>(config->key_id().begin(),
-                                            config->key_id().end()))
+      .set_key_id(std::vector<uint8_t>(config->key_id().begin(),
+                                       config->key_id().end()))
       .set_init_vector(
           std::vector<uint8_t>(config->iv().begin(), config->iv().end()))
       .set_subsamples(GetSubsamples(config->subsamples()));