Add ProxyDecryptor which wraps concrete Decryptor implementations.

webkit/media/webmediaplayer_impl.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.
 
 // Delegate calls from WebCore::MediaPlayerPrivate to Chrome's video player.
 // It contains Pipeline which is the actual media player pipeline, it glues
 // the media player pipeline, data source, audio renderer and renderer.
 // Pipeline would creates multiple threads and access some public methods
 // of this class, so we need to be extra careful about concurrent access of
 // methods and members.
@@ skipping 61 matching lines @@
 class WebFrame;
 }
 
 namespace media {
 class MediaLog;
 }
 
 namespace webkit_media {
 
 class MediaStreamClient;
+class ProxyDecryptor;
 class WebMediaPlayerDelegate;
 class WebMediaPlayerProxy;
 
 class WebMediaPlayerImpl
     : public WebKit::WebMediaPlayer,
       public MessageLoop::DestructionObserver,
       public base::SupportsWeakPtr<WebMediaPlayerImpl> {
  public:
   // Construct a WebMediaPlayerImpl with reference to the client, and media
   // filter collection. By providing the filter collection the implementor can
@@ skipping 193 matching lines @@
   scoped_ptr<media::FilterCollection> filter_collection_;
 
   // The media pipeline and a bool tracking whether we have started it yet.
   //
   // TODO(scherkus): replace |started_| with a pointer check for |pipeline_| and
   // have WebMediaPlayerImpl return the default values to WebKit instead of
   // relying on Pipeline to take care of default values.
   scoped_refptr<media::Pipeline> pipeline_;
   bool started_;
 
-  // The decryptor that manages decryption keys and decrypts encrypted frames.
-  scoped_ptr<media::Decryptor> decryptor_;
+  // The currently selected key system. Empty string means that no key system
+  // has been selected.
+  WebKit::WebString current_key_system_;
 
   scoped_ptr<media::MessageLoopFactory> message_loop_factory_;
 
   // Playback state.
   //
   // TODO(scherkus): we have these because Pipeline favours the simplicity of a
   // single "playback rate" over worrying about paused/stopped etc...  It forces
   // all clients to manage the pause+playback rate externally, but is that
   // really a bad thing?
   //
@@ skipping 25 matching lines @@
   // Since accelerated compositing status is only known after the first layout,
   // we delay reporting it to UMA until that time.
   bool accelerated_compositing_reported_;
 
   bool incremented_externally_allocated_memory_;
 
   WebKit::WebAudioSourceProvider* audio_source_provider_;
 
   bool is_local_source_;
 
+  // The decryptor that manages decryption keys and decrypts encrypted frames.
+  scoped_ptr<webkit_media::ProxyDecryptor> decryptor_;

[scherkus (not reviewing), 2012/06/28 18:32:52]

this doesn't even have to be a scoped_ptr<> :)

[ddorwin, 2012/06/28 22:15:38]

Yes, that's what I was trying to say. Just do:
webkit_media::ProxyDecryptor decryptor_

[xhwang, 2012/06/28 23:31:42]

Done.

+
   DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
 };
 
 }  // namespace webkit_media
 
 #endif  // WEBKIT_MEDIA_WEBMEDIAPLAYER_IMPL_H_