Pass Client pointer in Initialize() for VDA/VEA

content/common/gpu/media/android_video_encode_accelerator.h

Index: content/common/gpu/media/android_video_encode_accelerator.h
diff --git a/content/common/gpu/media/android_video_encode_accelerator.h b/content/common/gpu/media/android_video_encode_accelerator.h
index e519a278c7766288bca8872b5358e1255291b09c..a1a3ade92a0e25f9f6e0a289e8f8d1c79c5231c9 100644
--- a/content/common/gpu/media/android_video_encode_accelerator.h
+++ b/content/common/gpu/media/android_video_encode_accelerator.h
@@ -31,15 +31,15 @@ namespace content {
 class CONTENT_EXPORT AndroidVideoEncodeAccelerator
     : public media::VideoEncodeAccelerator {
  public:
-  explicit AndroidVideoEncodeAccelerator(
-      media::VideoEncodeAccelerator::Client* client);
+  AndroidVideoEncodeAccelerator();
   virtual ~AndroidVideoEncodeAccelerator();
 
   static std::vector<media::VideoEncodeAccelerator::SupportedProfile>
       GetSupportedProfiles();
 
   // media::VideoEncodeAccelerator implementation.
-  virtual void Initialize(media::VideoFrame::Format format,
+  virtual void Initialize(Client* client,
+                          media::VideoFrame::Format format,
                           const gfx::Size& input_visible_size,
                           media::VideoCodecProfile output_profile,
                           uint32 initial_bitrate) OVERRIDE;
@@ -77,7 +77,7 @@ class CONTENT_EXPORT AndroidVideoEncodeAccelerator
 
   // VideoDecodeAccelerator::Client callbacks go here.  Invalidated once any
   // error triggers.
-  base::WeakPtrFactory<Client> client_ptr_factory_;
+  scoped_ptr<base::WeakPtrFactory<Client> > client_ptr_factory_;
 
   scoped_ptr<media::VideoCodecBridge> media_codec_;