Separate CDM initialization from GenerateKeyRequest & remove key_system parameters.

webkit/renderer/media/crypto/ppapi/clear_key_cdm.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 WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_CLEAR_KEY_CDM_H_
 #define WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_CLEAR_KEY_CDM_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 67 matching lines @@
     virtual ~Client();
 
     Status status() { return status_; }
     const std::string& session_id() { return session_id_; }
     const std::string& key_message() { return key_message_; }
     const std::string& default_url() { return default_url_; }
 
     // Resets the Client to a clean state.
     void Reset();
 
-    void KeyAdded(const std::string& key_system, const std::string& session_id);
-    void KeyError(const std::string& key_system,
-                  const std::string& session_id,
+    void KeyAdded(const std::string& session_id);
+    void KeyError(const std::string& session_id,
                   media::MediaKeys::KeyError error_code,
                   int system_code);
-    void KeyMessage(const std::string& key_system,
-                    const std::string& session_id,
+    void KeyMessage(const std::string& session_id,
                     const std::string& message,
                     const std::string& default_url);
-    void NeedKey(const std::string& key_system,
-                 const std::string& session_id,
+    void NeedKey(const std::string& session_id,
                  const std::string& type,
                  scoped_ptr<uint8[]> init_data, int init_data_length);
 
    private:
     Status status_;
     std::string session_id_;
     std::string key_message_;
     std::string default_url_;
   };
 
@@ skipping 58 matching lines @@
 #endif  // CLEAR_KEY_CDM_USE_FFMPEG_DECODER
 
   scoped_ptr<CdmVideoDecoder> video_decoder_;
 
   DISALLOW_COPY_AND_ASSIGN(ClearKeyCdm);
 };
 
 }  // namespace webkit_media
 
 #endif  // WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_CLEAR_KEY_CDM_H_