Remove content switches dependency in content/common/gpu.

content/common/gpu/media/video_decode_accelerator_unittest.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.
 //
 // The bulk of this file is support code; sorry about that.  Here's an overview
 // to hopefully help readers of this code:
 // - RenderingHelper is charged with interacting with X11/{EGL/GLES2,GLX/GL} or
 //   Win/EGL.
 // - ClientState is an enum for the state of the decode client used by the test.
 // - ClientStateNotification is a barrier abstraction that allows the test code
@@ skipping 31 matching lines @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/condition_variable.h"
 #include "base/synchronization/lock.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/thread.h"
 #include "build/build_config.h"
 #include "content/common/gpu/media/fake_video_decode_accelerator.h"
 #include "content/common/gpu/media/rendering_helper.h"
 #include "content/common/gpu/media/video_accelerator_unittest_helpers.h"
-#include "content/public/common/content_switches.h"
 #include "media/filters/h264_parser.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gl/gl_image.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #include "content/common/gpu/media/dxva_video_decode_accelerator_win.h"
 #elif defined(OS_CHROMEOS)
 #if defined(USE_V4L2_CODEC)
@@ skipping 451 matching lines @@
         base::Bind(&DoNothingReturnTrue)));
   }
   return decoder;
 }
 
 scoped_ptr<media::VideoDecodeAccelerator>
 GLRenderingVDAClient::CreateDXVAVDA() {
   scoped_ptr<media::VideoDecodeAccelerator> decoder;
 #if defined(OS_WIN)
   if (base::win::GetVersion() >= base::win::VERSION_WIN7) {
-    const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
-    const bool enable_accelerated_vpx_decode =
-        cmd_line->HasSwitch(switches::kEnableAcceleratedVpxDecode);
+    const bool enable_accelerated_vpx_decode = false;

[Pawel Osciak, 2016/03/18 01:56:57]

Removing this may prevent us from testing this feature I believe. I'm not the
owner of DXVA, but this is perhaps needed?

[Peng, 2016/03/18 15:16:44]

Do we need pass the --enable-accelerated-vpx-decode to this unit test manually?
If not, I think the change is OK. I think it is not hard to test DXVAVDA decoder
with both vpx enabled and disabled. Just need make the
enable_accelerated_vpx_decode as an argument, and call this function twice with
different bool values. But seems we are not testing the DXVAV decoder with vpx
enabled right now, so I didn't do it. But we could do it when it is needed.
Thought?

     decoder.reset(new DXVAVideoDecodeAccelerator(
         base::Bind(&DoNothingReturnTrue),
         rendering_helper_->GetGLContext().get(),
         enable_accelerated_vpx_decode));
   }
 #endif
   return decoder;
 }
 
 scoped_ptr<media::VideoDecodeAccelerator>
@@ skipping 1110 matching lines @@
   content::VaapiWrapper::PreSandboxInitialization();
 #endif
 
   content::g_env =
       reinterpret_cast<content::VideoDecodeAcceleratorTestEnvironment*>(
           testing::AddGlobalTestEnvironment(
               new content::VideoDecodeAcceleratorTestEnvironment()));
 
   return RUN_ALL_TESTS();
 }