Fix enable-accelerated-video-decode flag propagation on linux

cl https://chromium-review.googlesource.com/c/chromium/src/+/2483862
added a check for the flag, but the flag was never propagated to the gpu
process.

Change-Id: Ia01b50a0e8caf11bb4b08941fa4eead2c2b4d162
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2503818Reviewed-by: Zhenyao Mo <zmo@chromium.org>
Commit-Queue: Ted Meyer <tmathmeyer@chromium.org>
Cr-Commit-Position: refs/heads/master@{#821589}

content/gpu/gpu_main.cc

@@ -130,7 +130,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHelper {
 
  private:
   // SandboxHelper:
-  void PreSandboxStartup() override {
+  void PreSandboxStartup(const gpu::GpuPreferences& gpu_prefs) override {
     // Warm up resources that don't need access to GPUInfo.
     {
       TRACE_EVENT0("gpu", "Warm up rand");
@@ -144,8 +144,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHelper {
 #if BUILDFLAG(IS_ASH)
     media::VaapiWrapper::PreSandboxInitialization();
 #else  // For any non-ash chrome (ie: linux or lacros) that can support vaapi.
-    const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
-    if (cmd_line->HasSwitch(switches::kEnableAcceleratedVideoDecode))
+    if (!gpu_prefs.disable_accelerated_video_decode)
       media::VaapiWrapper::PreSandboxInitialization();
 #endif
 #endif  // BUILDFLAG(USE_VAAPI)

gpu/ipc/service/gpu_init.cc

@@ -264,14 +264,14 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line,
   if (gpu_preferences_.gpu_sandbox_start_early) {
     // The sandbox will be started earlier than usual (i.e. before GL) so
     // execute the pre-sandbox steps now.
-    sandbox_helper_->PreSandboxStartup();
+    sandbox_helper_->PreSandboxStartup(gpu_preferences);
   }
 #else
   // For some reasons MacOSX's VideoToolbox might crash when called after
   // initializing GL, see crbug.com/1047643 and crbug.com/871280. On other
   // operating systems like Windows and Android the pre-sandbox steps have
   // always been executed before initializing GL so keep it this way.
-  sandbox_helper_->PreSandboxStartup();
+  sandbox_helper_->PreSandboxStartup(gpu_preferences);
 #endif
 
   // Start the GPU watchdog only after anything that is expected to be time
@@ -379,7 +379,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line,
       watchdog_thread_->PauseWatchdog();
 
     // The sandbox is not started yet.
-    sandbox_helper_->PreSandboxStartup();
+    sandbox_helper_->PreSandboxStartup(gpu_preferences);
 
     if (watchdog_thread_)
       watchdog_thread_->ResumeWatchdog();

gpu/ipc/service/gpu_init.h

@@ -32,7 +32,7 @@ class GPU_IPC_SERVICE_EXPORT GpuSandboxHelper {
  public:
   virtual ~GpuSandboxHelper() = default;
 
-  virtual void PreSandboxStartup() = 0;
+  virtual void PreSandboxStartup(const GpuPreferences& gpu_prefs) = 0;
 
   virtual bool EnsureSandboxInitialized(GpuWatchdogThread* watchdog_thread,
                                         const GPUInfo* gpu_info,