Encrypted Media: Implement IPC based SetCdm().

content/renderer/media/crypto/proxy_decryptor.h

 // 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.
 
 #ifndef CONTENT_RENDERER_MEDIA_CRYPTO_PROXY_DECRYPTOR_H_
 #define CONTENT_RENDERER_MEDIA_CRYPTO_PROXY_DECRYPTOR_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 41 matching lines @@
                               uint32 system_code)> KeyErrorCB;
   typedef base::Callback<void(const std::string& session_id,
                               const std::vector<uint8>& message,
                               const std::string& default_url)> KeyMessageCB;
 
   ProxyDecryptor(
 #if defined(ENABLE_PEPPER_CDMS)
       const CreatePepperCdmCB& create_pepper_cdm_cb,
 #elif defined(OS_ANDROID)
       RendererMediaPlayerManager* manager,
-      int cdm_id,
 #endif  // defined(ENABLE_PEPPER_CDMS)
       const KeyAddedCB& key_added_cb,
       const KeyErrorCB& key_error_cb,
       const KeyMessageCB& key_message_cb);
   virtual ~ProxyDecryptor();
 
   // Returns the Decryptor associated with this object. May be NULL if no
   // Decryptor is associated.
   media::Decryptor* GetDecryptor();
 
+  // Returns the CDM ID associated with this object. May be kInvalidCdmId if no
+  // CDM ID is associated.

[ddorwin, 2014/03/25 23:03:59]

Comment why that might happen?
Can we just disallow calling it before Initialize()?

[xhwang, 2014/03/26 06:02:04]

Even after Initialize() this could still happen, e.g. when AesDecryptor was
chosen.

+  int GetCdmId();
+
   // Only call this once.
   bool InitializeCDM(const std::string& key_system, const GURL& frame_url);
 
   // May only be called after InitializeCDM() succeeds.
   bool GenerateKeyRequest(const std::string& type,
                           const uint8* init_data,
                           int init_data_length);
   void AddKey(const uint8* key, int key_length,
               const uint8* init_data, int init_data_length,
               const std::string& session_id);
@@ skipping 55 matching lines @@
 
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<ProxyDecryptor> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ProxyDecryptor);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_CRYPTO_PROXY_DECRYPTOR_H_