EME: Address TODOs related to the removal of prefixed EME

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 <stddef.h>
 #include <list>
 #include <utility>
 #include <vector>
@@ skipping 250 matching lines @@
     EmeInitDataType init_data_type,
     const std::vector<uint8_t>& init_data,
     std::unique_ptr<NewSessionCdmPromise> promise) {
   std::string session_id(base::UintToString(next_session_id_++));
   valid_sessions_.insert(session_id);
 
   // For now, the AesDecryptor does not care about |session_type|.
   // TODO(jrummell): Validate |session_type|.
 
   std::vector<uint8_t> message;
-  // TODO(jrummell): Since unprefixed will never send NULL, remove this check

[ddorwin, 2016/06/23 01:06:47]

I think we could have removed this before when we converted from a pointer to a
vector.

-  // when prefixed EME is removed (http://crbug.com/249976).
-  if (!init_data.empty()) {
-    std::vector<std::vector<uint8_t>> keys;
-    switch (init_data_type) {
-      case EmeInitDataType::WEBM:
-        // |init_data| is simply the key needed.
-        keys.push_back(init_data);
-        break;
-      case EmeInitDataType::CENC:
+  std::vector<std::vector<uint8_t>> keys;
+  switch (init_data_type) {
+    case EmeInitDataType::WEBM:
+      // |init_data| is simply the key needed.
+      keys.push_back(init_data);
+      break;
+    case EmeInitDataType::CENC:
 #if defined(USE_PROPRIETARY_CODECS)
-        // |init_data| is a set of 0 or more concatenated 'pssh' boxes.
-        if (!GetKeyIdsForCommonSystemId(init_data, &keys)) {
-          promise->reject(NOT_SUPPORTED_ERROR, 0,
-                          "No supported PSSH box found.");
-          return;
-        }
-        break;
+      // |init_data| is a set of 0 or more concatenated 'pssh' boxes.
+      if (!GetKeyIdsForCommonSystemId(init_data, &keys)) {
+        promise->reject(NOT_SUPPORTED_ERROR, 0, "No supported PSSH box found.");
+        return;
+      }
+      break;
 #else
-        promise->reject(NOT_SUPPORTED_ERROR, 0,
-                        "Initialization data type CENC is not supported.");
+      promise->reject(NOT_SUPPORTED_ERROR, 0,
+                      "Initialization data type CENC is not supported.");
+      return;
+#endif
+    case EmeInitDataType::KEYIDS: {
+      std::string init_data_string(init_data.begin(), init_data.end());
+      std::string error_message;
+      if (!ExtractKeyIdsFromKeyIdsInitData(init_data_string, &keys,
+                                           &error_message)) {
+        promise->reject(NOT_SUPPORTED_ERROR, 0, error_message);
         return;
-#endif
-      case EmeInitDataType::KEYIDS: {
-        std::string init_data_string(init_data.begin(), init_data.end());
-        std::string error_message;
-        if (!ExtractKeyIdsFromKeyIdsInitData(init_data_string, &keys,
-                                             &error_message)) {
-          promise->reject(NOT_SUPPORTED_ERROR, 0, error_message);
-          return;
-        }
-        break;
       }
-      default:
-        NOTREACHED();
-        promise->reject(NOT_SUPPORTED_ERROR, 0,
-                        "init_data_type not supported.");
-        return;
+      break;
     }
-    CreateLicenseRequest(keys, session_type, &message);
+    default:
+      NOTREACHED();
+      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.
   GURL empty_gurl;
   session_message_cb_.Run(session_id, LICENSE_REQUEST, message, empty_gurl);
 }
 
 void AesDecryptor::LoadSession(SessionType session_type,
                                const std::string& session_id,
@@ skipping 87 matching lines @@
   valid_sessions_.erase(it);
 
   // Close the session.
   DeleteKeysForSession(session_id);
   promise->resolve();
   session_closed_cb_.Run(session_id);
 }
 
 void AesDecryptor::RemoveSession(const std::string& session_id,
                                  std::unique_ptr<SimpleCdmPromise> promise) {
-  // AesDecryptor doesn't keep any persistent data, so this should be
-  // NOT_REACHED().
-  // TODO(jrummell): Make sure persistent session types are rejected.
-  // http://crbug.com/384152.
-  //
-  // However, v0.1b calls to CancelKeyRequest() will call this, so close the
-  // session, if it exists.
-  // TODO(jrummell): Remove the close() call when prefixed EME is removed.
-  // http://crbug.com/249976.
-  if (valid_sessions_.find(session_id) != valid_sessions_.end()) {
-    CloseSession(session_id, std::move(promise));
-    return;
-  }
-
+  NOTREACHED() << "AesDecryptor doesn't support persistent sessions.";
   promise->reject(INVALID_ACCESS_ERROR, 0, "Session does not exist.");
 }
 
 CdmContext* AesDecryptor::GetCdmContext() {
   return this;
 }
 
 Decryptor* AesDecryptor::GetDecryptor() {
   return this;
 }
@@ skipping 165 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