Reland: Pass initDataType instead of contentType to OnNeedKey().

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 <cstring>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 77 matching lines @@
   return true;
 }
 
 // Returns true if |data| is prefixed with |header| and has data after the
 // |header|.
 bool HasHeader(const uint8* data, int data_length, const std::string& header) {
   return static_cast<size_t>(data_length) > header.size() &&
          std::equal(data, data + header.size(), header.begin());
 }
 
-bool ProxyDecryptor::GenerateKeyRequest(const std::string& content_type,
+bool ProxyDecryptor::GenerateKeyRequest(const std::string& init_data_type,
                                         const uint8* init_data,
                                         int init_data_length) {
   DVLOG(1) << "GenerateKeyRequest()";
   const char kPrefixedApiPersistentSessionHeader[] = "PERSISTENT|";
   const char kPrefixedApiLoadSessionHeader[] = "LOAD_SESSION|";
 
   SessionCreationType session_creation_type = TemporarySession;
   if (HasHeader(init_data, init_data_length, kPrefixedApiLoadSessionHeader)) {
     session_creation_type = LoadSession;
   } else if (HasHeader(init_data,
@@ skipping 18 matching lines @@
                     init_data_length - strlen(kPrefixedApiLoadSessionHeader)),
         promise.Pass());
     return true;
   }
 
   media::MediaKeys::SessionType session_type =
       session_creation_type == PersistentSession
           ? media::MediaKeys::PERSISTENT_SESSION
           : media::MediaKeys::TEMPORARY_SESSION;
 
-  // Convert MIME types used in the prefixed implementation.
-  std::string init_data_type;
-  if (content_type == "audio/mp4" || content_type == "video/mp4") {
-    init_data_type = "cenc";
-  } else if (content_type == "audio/webm" || content_type == "video/webm") {
-    init_data_type = "webm";
-  } else {
-    NOTREACHED();
-    init_data_type = content_type;
-  }
-
   media_keys_->CreateSession(init_data_type, init_data, init_data_length,
                              session_type, promise.Pass());
   return true;
 }
 
 void ProxyDecryptor::AddKey(const uint8* key,
                             int key_length,
                             const uint8* init_data,
                             int init_data_length,
                             const std::string& web_session_id) {
@@ skipping 177 matching lines @@
   bool is_persistent =
       session_type == PersistentSession || session_type == LoadSession;
   active_sessions_.insert(std::make_pair(web_session_id, is_persistent));
 
   // For LoadSession(), generate the SessionReady event.
   if (session_type == LoadSession)
     OnSessionReady(web_session_id);
 }
 
 }  // namespace content