Block platform verification and file IO in the CDM adapter if the CDM configuration disallows them.

media/cdm/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 "media/cdm/proxy_decryptor.h"
 
 #include <cstring>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 180 matching lines @@
   media_keys_->RemoveSession(session_id, promise.Pass());
 }
 
 scoped_ptr<MediaKeys> ProxyDecryptor::CreateMediaKeys(
     CdmFactory* cdm_factory,
     const std::string& key_system,
     const GURL& security_origin) {
   base::WeakPtr<ProxyDecryptor> weak_this = weak_ptr_factory_.GetWeakPtr();
   return cdm_factory->Create(
       key_system,
+      true,  // Prefixed always requires permission, and always allows

[ddorwin, 2015/03/06 21:42:54]

This will DCHECK for AesDecryptor - or at least it will if you add those
DCHECKs. Perhaps a TODO there?
Also, aren't we moving the permission check here at some point? Perhaps TODO to
use the result of that (crbug.com/455271).

[sandersd (OOO until July 31), 2015/03/06 22:36:58]

Done.

+      true,  // distinctive identifiers and persistent state.
       security_origin,
       base::Bind(&ProxyDecryptor::OnSessionMessage, weak_this),
       base::Bind(&ProxyDecryptor::OnSessionClosed, weak_this),
       base::Bind(&ProxyDecryptor::OnSessionError, weak_this),
       base::Bind(&ProxyDecryptor::OnSessionKeysChange, weak_this),
       base::Bind(&ProxyDecryptor::OnSessionExpirationUpdate, weak_this));
 }
 
 void ProxyDecryptor::OnSessionMessage(const std::string& session_id,
                                       MediaKeys::MessageType message_type,
@@ skipping 85 matching lines @@
   bool is_persistent =
       session_type == PersistentSession || session_type == LoadSession;
   active_sessions_.insert(std::make_pair(session_id, is_persistent));
 
   // For LoadSession(), generate the KeyAdded event.
   if (session_type == LoadSession)
     GenerateKeyAdded(session_id);
 }
 
 }  // namespace media