Replace the explicit *VDA::Set{CGL,Egl,Glx}Context() methods with ctor params.

content/common/gpu/media/gpu_video_decode_accelerator.cc

 // 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.
 
 #include "content/common/gpu/media/gpu_video_decode_accelerator.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 151 matching lines @@
   }
 #endif
 
 #if defined(OS_WIN)
   if (base::win::GetVersion() < base::win::VERSION_WIN7) {
     NOTIMPLEMENTED() << "HW video decode acceleration not available.";
     NotifyError(media::VideoDecodeAccelerator::PLATFORM_FAILURE);
     return;
   }
   DLOG(INFO) << "Initializing DXVA HW decoder for windows.";
-  scoped_ptr<DXVAVideoDecodeAccelerator> video_decoder(
-      new DXVAVideoDecodeAccelerator(this));
-  video_decode_accelerator_ = video_decoder.Pass();
+  video_decode_accelerator_.reset(new DXVAVideoDecodeAccelerator(this));
 #elif defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL)
-  scoped_ptr<OmxVideoDecodeAccelerator> video_decoder(
-      new OmxVideoDecodeAccelerator(this));
-  video_decoder->SetEglState(
+  video_decode_accelerator_.reset(new OmxVideoDecodeAccelerator(
       gfx::GLSurfaceEGL::GetHardwareDisplay(),
-      stub_->decoder()->GetGLContext()->GetHandle());
-  video_decode_accelerator_ = video_decoder.Pass();
+      stub_->decoder()->GetGLContext()->GetHandle(),
+      this));
 #elif defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY)
-  scoped_ptr<VaapiVideoDecodeAccelerator> video_decoder(
-      new VaapiVideoDecodeAccelerator(this, make_context_current_));
   gfx::GLContextGLX* glx_context =
       static_cast<gfx::GLContextGLX*>(stub_->decoder()->GetGLContext());
   GLXContext glx_context_handle =
       static_cast<GLXContext>(glx_context->GetHandle());
-  video_decoder->SetGlxState(glx_context->display(), glx_context_handle);
-  video_decode_accelerator_ = video_decoder.Pass();
+  video_decode_accelerator_.reset(new VaapiVideoDecodeAccelerator(
+      glx_context->display(), glx_context_handle, this,
+      make_context_current_));
 #elif defined(OS_MACOSX)
-  scoped_ptr<MacVideoDecodeAccelerator> video_decoder(
-      new MacVideoDecodeAccelerator(this));
-  video_decoder->SetCGLContext(static_cast<CGLContextObj>(
-      stub_->decoder()->GetGLContext()->GetHandle()));
-  video_decode_accelerator_ = video_decoder.Pass();
+  video_decode_accelerator_.reset(new MacVideoDecodeAccelerator(
+      static_cast<CGLContextObj>(
+          stub_->decoder()->GetGLContext()->GetHandle()),
+      this));
 #else
   NOTIMPLEMENTED() << "HW video decode acceleration not available.";
   NotifyError(media::VideoDecodeAccelerator::PLATFORM_FAILURE);
   return;
 #endif
 
   if (!video_decode_accelerator_->Initialize(profile))
     NotifyError(media::VideoDecodeAccelerator::PLATFORM_FAILURE);
 }
 
@@ skipping 94 matching lines @@
   if (stub_) {
     stub_->RemoveDestructionObserver(this);
     stub_.reset();
   }
 }
 
 bool GpuVideoDecodeAccelerator::Send(IPC::Message* message) {
   DCHECK(sender_);
   return sender_->Send(message);
 }