Move OnNeedKey() to WebMediaPlayerImpl.

media/blink/webmediaplayer_impl.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 MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_
 #define MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 191 matching lines @@
   void OnOpacityChanged(bool opaque);
 
   // Called by VideoRendererImpl on its internal thread with the new frame to be
   // painted.
   void FrameReady(const scoped_refptr<VideoFrame>& frame);
 
   // Returns the current video frame from |compositor_|. Blocks until the
   // compositor can return the frame.
   scoped_refptr<VideoFrame> GetCurrentFrameFromCompositor();
 
+  // Called when the demuxer encounters encrypted streams.
+  void OnNeedKey(const std::string& type,
+                 const std::vector<uint8>& init_data);
+
   void SetCdm(CdmContext* cdm_context, const CdmAttachedCB& cdm_attached_cb);
 
   // Called when a CDM has been attached to the |pipeline_|.
   void OnCdmAttached(blink::WebContentDecryptionModuleResult result,
                      bool success);
 
   blink::WebLocalFrame* frame_;
 
   // TODO(hclam): get rid of these members and read from the pipeline directly.
   blink::WebMediaPlayer::NetworkState network_state_;
@@ skipping 82 matching lines @@
 
   // The compositor layer for displaying the video content when using composited
   // playback.
   scoped_ptr<cc_blink::WebLayerImpl> video_weblayer_;
 
   // Text track objects get a unique index value when they're created.
   int text_track_index_;
 
   EncryptedMediaPlayerSupport encrypted_media_support_;
 
+  // Temporary for EME v0.1. In the future the init data type should be passed

[ddorwin, 2014/12/02 20:49:49]

Future? Isn't this already implemented? Can we drop the second sentence?

A better solution might be to add a setIDT() to the WMPS interface. What do you
think?

[xhwang, 2014/12/02 21:57:47]

Done.

+  // directly from WebKit.
+  std::string init_data_type_;

[ddorwin, 2014/12/02 20:49:49]

Let's name it prefixed_eme_... or something like that to avoid confusion.

[xhwang, 2014/12/02 21:57:47]

Not needed since init_data_type_ is moved back to EMPS, which is prefixed EME
only.

+
   const AudioHardwareConfig& audio_hardware_config_;
 
   scoped_ptr<Renderer> renderer_;
 
   DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_