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

media/blink/cdm_session_adapter.h

 // Copyright 2014 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.
 
 #ifndef MEDIA_BLINK_CDM_SESSION_ADAPTER_H_
 #define MEDIA_BLINK_CDM_SESSION_ADAPTER_H_
 
 #include <map>
 #include <string>
 
@@ skipping 15 matching lines @@
 // Forwards the session ID-based callbacks of the MediaKeys interface to the
 // appropriate session object. Callers should hold references to this class
 // as long as they need the CDM instance.
 class CdmSessionAdapter : public base::RefCounted<CdmSessionAdapter> {
  public:
   CdmSessionAdapter();
 
   // Returns true on success.
   bool Initialize(CdmFactory* cdm_factory,
                   const std::string& key_system,
+                  bool allow_distincitve_identifier,

[jrummell, 2015/03/06 21:40:47]

s/citve/ctive/

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

Done.

+                  bool allow_persistent_state,
                   const GURL& security_origin);
 
   // Provides a server certificate to be used to encrypt messages to the
   // license server.
   void SetServerCertificate(const uint8* server_certificate,
                             int server_certificate_length,
                             scoped_ptr<SimpleCdmPromise> promise);
 
   // Creates a new session and adds it to the internal map. The caller owns the
   // created session. RemoveSession() must be called when destroying it, if
@@ skipping 86 matching lines @@
 
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<CdmSessionAdapter> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CdmSessionAdapter);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BLINK_CDM_SESSION_ADAPTER_H_