Pass Client pointer in Initialize() for VDA/VEA

content/common/gpu/media/android_video_decode_accelerator.cc

Index: content/common/gpu/media/android_video_decode_accelerator.cc
diff --git a/content/common/gpu/media/android_video_decode_accelerator.cc b/content/common/gpu/media/android_video_decode_accelerator.cc
index d08cb1f432fc24e7a1ad98ddd3977c01af4d634e..d0666498d58e034d1ff24e460e3b1160a18e8cbb 100644
--- a/content/common/gpu/media/android_video_decode_accelerator.cc
+++ b/content/common/gpu/media/android_video_decode_accelerator.cc
@@ -65,27 +65,27 @@ static inline const base::TimeDelta NoWaitTimeOut() {
 }
 
 AndroidVideoDecodeAccelerator::AndroidVideoDecodeAccelerator(

[Ami GONE FROM CHROMIUM, 2014/02/24 23:12:40]

NULL-initialize client_.
(gonna stop making this comment now; please make a pass for it through the whole
CL)

[sheu, 2014/02/24 23:48:20]

Done.

-    media::VideoDecodeAccelerator::Client* client,
     const base::WeakPtr<gpu::gles2::GLES2Decoder> decoder,
     const base::Callback<bool(void)>& make_context_current)
-    : client_(client),
-      make_context_current_(make_context_current),
+    : make_context_current_(make_context_current),
       codec_(media::kCodecH264),
       state_(NO_ERROR),
       surface_texture_id_(0),
       picturebuffers_requested_(false),
-      gl_decoder_(decoder) {
-}
+      gl_decoder_(decoder) {}
 
 AndroidVideoDecodeAccelerator::~AndroidVideoDecodeAccelerator() {
   DCHECK(thread_checker_.CalledOnValidThread());
 }
 
 bool AndroidVideoDecodeAccelerator::Initialize(
+    Client* client,
     media::VideoCodecProfile profile) {
   DCHECK(!media_codec_);
   DCHECK(thread_checker_.CalledOnValidThread());
 
+  client_ = client;
+
   if (!media::MediaCodecBridge::IsAvailable())
     return false;