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.

[ddorwin, 2014/08/13 20:59:54]

Here's another TODO for more pushing stuff up into Blink.

This may already be handled as it is step #3 of
https://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/encrypted-...

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

Done.

   // 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;
   }
 
   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";
+
+  if (init_data_type_as_ascii.find('/') != std::string::npos) {
+    DLOG(WARNING) << "init_data_type '" << init_data_type_as_ascii

[ddorwin, 2014/08/13 20:59:54]

IIRC, the DLOG_IF was a heads up that you may have used an old type. This will
be relevant after this conversion period, so it probably makes sense to just
leave it as it was. That also simplifies the logic below (even though it runs
more than might be necessary).

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

Done.

+                  << "' may be a MIME type";
+    // Attempt to translate content types.
+    // TODO(sandersd): Move to ProxyDecryptor. http://crbug.com/385874

[ddorwin, 2014/08/13 20:59:55]

When? After converting the prefixed APIs and tests?
TODOs should have a timeline if possible.

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

Done.

+    if (init_data_type_as_ascii == "audio/mp4" ||

[ddorwin, 2014/08/13 20:59:54]

Use braces for this complex multi-line conditional.

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

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,
@@ skipping 185 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