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

content/common/gpu/media/vaapi_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 "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/string_util.h"
@@ skipping 34 matching lines @@
   DVLOG(1) << "Notifying of error " << error;
 
   if (client_) {
     client_->NotifyError(error);
     client_ptr_factory_.InvalidateWeakPtrs();
   }
   Cleanup();
 }
 
 VaapiVideoDecodeAccelerator::VaapiVideoDecodeAccelerator(
+    Display* x_display, GLXContext glx_context,
     Client* client,
     const base::Callback<bool(void)>& make_context_current)
-    : make_context_current_(make_context_current),
+    : x_display_(x_display),
+      glx_context_(glx_context),
+      make_context_current_(make_context_current),
       state_(kUninitialized),
       input_ready_(&lock_),
       output_ready_(&lock_),
       message_loop_(MessageLoop::current()),
       weak_this_(base::AsWeakPtr(this)),
       client_ptr_factory_(client),
       client_(client_ptr_factory_.GetWeakPtr()),
       decoder_thread_("VaapiDecoderThread") {
   DCHECK(client);
 }
@@ skipping 21 matching lines @@
 
   CHECK(decoder_thread_.Start());
 
   state_ = kInitialized;
 
   message_loop_->PostTask(FROM_HERE, base::Bind(
       &Client::NotifyInitializeDone, client_));
   return true;
 }
 
-// TODO(posciak, fischman): try to move these to constructor parameters,
-// but while removing SetEglState from OVDA as well for symmetry.
-void VaapiVideoDecodeAccelerator::SetGlxState(Display* x_display,
-                                              GLXContext glx_context) {
-  DCHECK_EQ(message_loop_, MessageLoop::current());
-  x_display_ = x_display;
-  glx_context_ = glx_context;
-}
-
 void VaapiVideoDecodeAccelerator::SyncAndNotifyPictureReady(int32 input_id,
                                                             int32 output_id) {
   DCHECK_EQ(message_loop_, MessageLoop::current());
   // Handle Destroy() arriving while pictures are queued for output.
   if (!client_)
     return;
 
   // Sync the contents of the texture.
   RETURN_AND_NOTIFY_ON_FAILURE(decoder_.PutPicToTexture(output_id),
                                "Failed putting picture to texture",
@@ skipping 431 matching lines @@
                "Input id", input_id, "Picture id", output_id);
   DVLOG(4) << "Outputting picture, input id: " << input_id
            << " output id: " << output_id;
 
   // Forward the request to the main thread.
   DCHECK_EQ(decoder_thread_.message_loop(), MessageLoop::current());
   message_loop_->PostTask(FROM_HERE, base::Bind(
       &VaapiVideoDecodeAccelerator::SyncAndNotifyPictureReady, weak_this_,
       input_id, output_id));
 }