Remove support for non-JSON keys in AesDecryptor

content/renderer/media/crypto/proxy_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 "content/renderer/media/crypto/proxy_decryptor.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
@@ skipping 131 matching lines @@
     // compatibility the error is not thrown, but rather reported as a
     // KeyError.
     key_error_cb_.Run(std::string(), media::MediaKeys::kUnknownError, 0);
     return;
   }
 
   // EME WD spec only supports a single array passed to the CDM. For
   // Clear Key using v0.1b, both arrays are used (|init_data| is key_id).
   // Since the EME WD spec supports the key as a JSON Web Key,
   // convert the 2 arrays to a JWK and pass it as the single array.
-  // TODO(jrummell): When updating Decryptor interface to match WD, move the
-  // workaround for handling |init_data| == null here.
-  if (is_clear_key_ && init_data_length) {
+  if (is_clear_key_) {
+    // Decryptor doesn't support empty key ID (see http://crbug.com/123265).
+    // So ensure a non-empty value is passed.
+    if (!init_data) {
+      static const uint8 kDummyInitData[1] = {0};
+      init_data = kDummyInitData;
+      init_data_length = arraysize(kDummyInitData);
+    }
+
     std::string jwk =
         media::GenerateJWKSet(key, key_length, init_data, init_data_length);
     DCHECK(!jwk.empty());
     media_keys_->AddKey(reference_id,
                         reinterpret_cast<const uint8*>(jwk.data()), jwk.size(),
                         NULL, 0);
     return;
   }
 
   media_keys_->AddKey(reference_id, key, key_length, NULL, 0);
@@ skipping 81 matching lines @@
 
 const std::string& ProxyDecryptor::LookupSessionId(uint32 reference_id) {
   DCHECK_NE(reference_id, INVALID_REFERENCE_ID);
 
   // Session may not exist if error happens during GenerateKeyRequest().
   SessionIdMap::iterator it = sessions_.find(reference_id);
   return (it != sessions_.end()) ? it->second : EmptyString();
 }
 
 }  // namespace content