Convert between |init_data_type| and content type.

content/renderer/media/webcontentdecryptionmodulesession_impl.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/webcontentdecryptionmodulesession_impl.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
@@ skipping 67 matching lines @@
 }
 
 blink::WebString WebContentDecryptionModuleSessionImpl::sessionId() const {
   return blink::WebString::fromUTF8(web_session_id_);
 }
 
 void WebContentDecryptionModuleSessionImpl::initializeNewSession(
     const blink::WebString& init_data_type,
     const uint8* init_data,
     size_t init_data_length) {
-  // TODO(ddorwin): Guard against this in supported types check and remove this.
-  // Chromium only supports ASCII MIME types.
-  if (!base::IsStringASCII(init_data_type)) {
-    NOTREACHED();
-    OnSessionError(media::MediaKeys::NOT_SUPPORTED_ERROR,
-                   0,
-                   "The initialization data type " + init_data_type.utf8() +
-                       " is not supported by the key system.");
-    return;
-  }
+  DCHECK(base::IsStringASCII(init_data_type));
 
   std::string init_data_type_as_ascii = base::UTF16ToASCII(init_data_type);
   DLOG_IF(WARNING, init_data_type_as_ascii.find('/') != std::string::npos)
       << "init_data_type '" << init_data_type_as_ascii
       << "' may be a MIME type";
 
+  // Attempt to translate content types.
+  // TODO(sandersd): Remove once tests stop using content types.
+  // http://crbug.com/385874
+  if (init_data_type_as_ascii == "audio/mp4" ||

[ddorwin, 2014/08/13 22:26:59]

You need to call something like ToLowerCase().

[sandersd (OOO until July 31), 2014/08/13 22:34:43]

Done.

+      init_data_type_as_ascii == "video/mp4") {
+    init_data_type_as_ascii = "cenc";
+  } else if (init_data_type_as_ascii == "audio/webm" ||
+             init_data_type_as_ascii == "video/webm") {
+    init_data_type_as_ascii = "webm";
+  }
+
   scoped_ptr<media::NewSessionCdmPromise> promise(
       new media::NewSessionCdmPromise(
           base::Bind(&WebContentDecryptionModuleSessionImpl::SessionCreated,
                      weak_ptr_factory_.GetWeakPtr(),
                      kReservedIndex),
           base::Bind(&WebContentDecryptionModuleSessionImpl::OnSessionError,
                      weak_ptr_factory_.GetWeakPtr())));
   adapter_->InitializeNewSession(init_data_type_as_ascii,
                                  init_data,
                                  init_data_length,
@@ skipping 184 matching lines @@
 
 uint32 WebContentDecryptionModuleSessionImpl::AddResult(
     blink::WebContentDecryptionModuleResult result) {
   uint32 result_index = next_available_result_index_++;
   DCHECK(result_index != kReservedIndex);
   outstanding_results_.insert(std::make_pair(result_index, result));
   return result_index;
 }
 
 }  // namespace content