Convert between |init_data_type| and content type.

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 110 matching lines @@
         std::string(reinterpret_cast<const char*>(
                         init_data + strlen(kPrefixedApiLoadSessionHeader)),
                     init_data_length - strlen(kPrefixedApiLoadSessionHeader)),
         promise.Pass());
     return true;
   }
 
   media::MediaKeys::SessionType session_type =
       persistent ? media::MediaKeys::PERSISTENT_SESSION
                  : media::MediaKeys::TEMPORARY_SESSION;
-  media_keys_->CreateSession(
-      content_type, init_data, init_data_length, session_type, promise.Pass());
+
+  // Translate content types.

[ddorwin, 2014/08/13 21:43:34]

nit: "Convert MIME type's used in the prefixed implementation."

[sandersd (OOO until July 31), 2014/08/13 21:50:58]

Done.

+  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 {
+    init_data_type = content_type;

[ddorwin, 2014/08/13 21:43:34]

I wonder if we can add NOTREACHED(). If it only comes from ChunkDemuxer or
WMPA/WMPI, we know the values.

[sandersd (OOO until July 31), 2014/08/13 21:50:58]

Well, it's worth a try.

+  }
+
+  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) {
   DVLOG(1) << "AddKey()";
 
@@ skipping 142 matching lines @@
   }
   key_error_cb_.Run(web_session_id, error_code, system_code);
 }
 
 void ProxyDecryptor::SetSessionId(bool persistent,
                                   const std::string& web_session_id) {
   active_sessions_.insert(std::make_pair(web_session_id, persistent));
 }
 
 }  // namespace content