Plumb |use_secure_codecs| through to BrowserCdmFactoryAndroid.

content/renderer/media/crypto/render_cdm_factory.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/render_cdm_factory.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop_proxy.h"
+#include "media/base/cdm_config.h"
 #include "media/base/cdm_promise.h"
 #include "media/base/key_systems.h"
 #include "media/base/media_keys.h"
 #include "media/cdm/aes_decryptor.h"
 #include "url/gurl.h"
 #if defined(ENABLE_PEPPER_CDMS)
 #include "content/renderer/media/crypto/ppapi_decryptor.h"
 #elif defined(ENABLE_BROWSER_CDMS)
 #include "content/renderer/media/crypto/proxy_media_keys.h"
 #endif  // defined(ENABLE_PEPPER_CDMS)
@@ skipping 15 matching lines @@
 #endif  // defined(ENABLE_PEPPER_CDMS)
 {
 }
 
 RenderCdmFactory::~RenderCdmFactory() {
   DCHECK(thread_checker_.CalledOnValidThread());
 }
 
 void RenderCdmFactory::Create(
     const std::string& key_system,
-    bool allow_distinctive_identifier,
-    bool allow_persistent_state,
     const GURL& security_origin,
+    const media::CdmConfig& cdm_config,
     const media::SessionMessageCB& session_message_cb,
     const media::SessionClosedCB& session_closed_cb,
     const media::LegacySessionErrorCB& legacy_session_error_cb,
     const media::SessionKeysChangeCB& session_keys_change_cb,
     const media::SessionExpirationUpdateCB& session_expiration_update_cb,
     const media::CdmCreatedCB& cdm_created_cb) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   if (!security_origin.is_valid()) {
     base::MessageLoopProxy::current()->PostTask(
         FROM_HERE, base::Bind(cdm_created_cb, nullptr, "Invalid origin."));
     return;
   }
 
   if (media::CanUseAesDecryptor(key_system)) {
     // TODO(sandersd): Currently the prefixed API always allows distinctive
     // identifiers and persistent state. Once that changes we can sanity check
     // here that neither is allowed for AesDecryptor, since it does not support
     // them and should never be configured that way. http://crbug.com/455271
     scoped_ptr<media::MediaKeys> cdm(
         new media::AesDecryptor(security_origin, session_message_cb,
                                 session_closed_cb, session_keys_change_cb));
     base::MessageLoopProxy::current()->PostTask(
         FROM_HERE, base::Bind(cdm_created_cb, base::Passed(&cdm), ""));
     return;
   }
 
 #if defined(ENABLE_PEPPER_CDMS)
+  DCHECK(!cdm_config.use_secure_codecs);

[ddorwin, 2015/05/13 06:03:20]

Since we just pass around a type now instead of parameters, we _could_ ifdef
individual members. I don't know that it's any better unless we end up with lots
of members that are meaningless on various platforms. However, it would avoid
confusing statements like this one.

[sandersd (OOO until July 31), 2015/05/14 00:06:57]

Acknowledged.

   PpapiDecryptor::Create(
-      key_system, allow_distinctive_identifier, allow_persistent_state,
-      security_origin, create_pepper_cdm_cb_, session_message_cb,
-      session_closed_cb, legacy_session_error_cb, session_keys_change_cb,
-      session_expiration_update_cb, cdm_created_cb);
+      key_system, security_origin, cdm_config.allow_distinctive_identifier,
+      cdm_config.allow_persistent_state, create_pepper_cdm_cb_,
+      session_message_cb, session_closed_cb, legacy_session_error_cb,
+      session_keys_change_cb, session_expiration_update_cb, cdm_created_cb);
 #elif defined(ENABLE_BROWSER_CDMS)
-  DCHECK(allow_distinctive_identifier);
-  DCHECK(allow_persistent_state);
-  ProxyMediaKeys::Create(key_system, security_origin, manager_,
-                         session_message_cb, session_closed_cb,
-                         legacy_session_error_cb, session_keys_change_cb,
-                         session_expiration_update_cb, cdm_created_cb);
+  DCHECK(cdm_config.allow_distinctive_identifier);

[ddorwin, 2015/05/13 06:03:20]

These DCHECKs are consistent with the KS selector code IIRC.

It seems that we should just pass them down with the struct, but then I remember
that we can't enforce false, so this probably does make sense (until such time
as we need to support false).

[gunsch, 2015/05/13 06:52:37]

One odd edge case we ran into on Chromecast today: we comment out the
CanUseAesDecryptor block above downstream (Cast but non-Android) so that we can
use our browser-side clearkey implementation. At that point, this check ends up
getting hit.

[ddorwin, 2015/05/14 00:17:31]

Hmm. Let's discuss. There is definitely an assumption (unrelated to this CL)
about Clear Key.
Rather than commenting out the CanUseAesDecryptor() call, you should change its
definition, which is closer to that assumption.

[gunsch, 2015/05/14 01:35:52]

Agreed, we realize commenting it out isn't valid at all but we don't need the
"normal" path (on Cast Linux). What are your thoughts on a way to approach it?
My initial thinking (for browser-CDM-based embedders, incl. Android) would be to
simply guard the use of renderer-side AesDecryptor by
!defined(ENABLE_BROWSER_CDMS) and reuse the decryption code both
browser/renderer-side. WDYT?

+  DCHECK(cdm_config.allow_persistent_state);
+  ProxyMediaKeys::Create(
+      key_system, security_origin, cdm_config.use_secure_codecs, manager_,
+      session_message_cb, session_closed_cb, legacy_session_error_cb,
+      session_keys_change_cb, session_expiration_update_cb, cdm_created_cb);
 #else
   // No possible CDM to create, so fail the request.
   base::MessageLoopProxy::current()->PostTask(
       FROM_HERE,
       base::Bind(cdm_created_cb, nullptr, "Key system not supported."));
 #endif  // defined(ENABLE_PEPPER_CDMS)
 }
 
 }  // namespace content