Update Clear Key to support keyids formatted init_data

media/cdm/aes_decryptor.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/cdm/aes_decryptor.h"
 
 #include <list>
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 255 matching lines @@
     if (init_data_type == "webm") {
       // |init_data| is simply the key needed.
       keys.push_back(
           std::vector<uint8>(init_data, init_data + init_data_length));
     } else if (init_data_type == "cenc") {
       // |init_data| is a set of 0 or more concatenated 'pssh' boxes.
       if (!GetKeyIdsForCommonSystemId(init_data, init_data_length, &keys)) {
         promise->reject(NOT_SUPPORTED_ERROR, 0, "No supported PSSH box found.");
         return;
       }
+    } else if (init_data_type == "keyids") {
+      std::string init_data_string(init_data, init_data + init_data_length);
+      std::string error_message;
+      if (!ExtractKeyIdsFromKeyIdsInitData(init_data_string, &keys,
+                                           &error_message)) {
+        promise->reject(NOT_SUPPORTED_ERROR, 0, error_message);
+        return;
+      }
     } else {
-      // TODO(jrummell): Support init_data_type == "keyids".
       promise->reject(NOT_SUPPORTED_ERROR, 0, "init_data_type not supported.");
       return;
     }
     CreateLicenseRequest(keys, session_type, &message);
   }
 
   promise->resolve(session_id);
 
   // No URL needed for license requests.
   session_message_cb_.Run(session_id, LICENSE_REQUEST, message,
@@ skipping 281 matching lines @@
 bool AesDecryptor::DecryptionKey::Init() {
   CHECK(!secret_.empty());
   decryption_key_.reset(crypto::SymmetricKey::Import(
       crypto::SymmetricKey::AES, secret_));
   if (!decryption_key_)
     return false;
   return true;
 }
 
 }  // namespace media