Add "type" in GenerateKeyRequest() and OnNeedKey().

webkit/media/webmediaplayer_proxy.h

 // Copyright (c) 2012 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_MEDIA_WEBMEDIAPLAYER_PROXY_H_
 #define WEBKIT_MEDIA_WEBMEDIAPLAYER_PROXY_H_
 
 #include <list>
 #include <string>
 #include <vector>
@@ skipping 67 matching lines @@
                         const std::string& session_id,
                         media::Decryptor::KeyError error_code,
                         int system_code) OVERRIDE;
   virtual void KeyMessage(const std::string& key_system,
                           const std::string& session_id,
                           scoped_array<uint8> message,
                           int message_length,
                           const std::string& default_url) OVERRIDE;
   virtual void NeedKey(const std::string& key_system,
                        const std::string& session_id,
+                       const std::string& type,
                        scoped_array<uint8> init_data,
                        int init_data_size) OVERRIDE;
 
  private:
   friend class base::RefCountedThreadSafe<WebMediaPlayerProxy>;
   virtual ~WebMediaPlayerProxy();
 
   // Invoke |webmediaplayer_| to perform a repaint.
   void RepaintTask();
 
@@ skipping 10 matching lines @@
   // Notify |webmediaplayer_| that a key message has been generated.
   void KeyMessageTask(const std::string& key_system,
                       const std::string& session_id,
                       scoped_array<uint8> message,
                       int message_length,
                       const std::string& default_url);
 
   // Notify |webmediaplayer_| that a key is needed for decryption.
   void NeedKeyTask(const std::string& key_system,
                    const std::string& session_id,
+                   const std::string& type,
                    scoped_array<uint8> init_data,
                    int init_data_size);
 
   // The render message loop where WebKit lives.
   scoped_refptr<base::MessageLoopProxy> render_loop_;
   WebMediaPlayerImpl* webmediaplayer_;
 
   scoped_refptr<BufferedDataSource> data_source_;
   scoped_refptr<media::VideoRendererBase> frame_provider_;
   media::SkCanvasVideoRenderer video_renderer_;
 
   base::Lock lock_;
   int outstanding_repaints_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(WebMediaPlayerProxy);
 };
 
 }  // namespace webkit_media
 
 #endif  // WEBKIT_MEDIA_WEBMEDIAPLAYER_PROXY_H_