Revert of content gpu refactor: get rid of gpu related content switches.

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 503 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);
-  decoder.reset(new DXVAVideoDecodeAccelerator(
-      base::Bind(&DoNothingReturnTrue), rendering_helper_->GetGLContext().get(),
-      enable_accelerated_vpx_decode));
+    decoder.reset(
+        new DXVAVideoDecodeAccelerator(
+            base::Bind(&DoNothingReturnTrue),
+            rendering_helper_->GetGLContext().get()));
 #endif
   return decoder;
 }
 
 scoped_ptr<media::VideoDecodeAccelerator>
 GLRenderingVDAClient::CreateV4L2VDA() {
   scoped_ptr<media::VideoDecodeAccelerator> decoder;
 #if defined(OS_CHROMEOS) && defined(USE_V4L2_CODEC)
   scoped_refptr<V4L2Device> device = V4L2Device::Create(V4L2Device::kDecoder);
   if (device.get()) {
@@ skipping 1105 matching lines @@
   content::VaapiWrapper::PreSandboxInitialization();
 #endif
 
   content::g_env =
       reinterpret_cast<content::VideoDecodeAcceleratorTestEnvironment*>(
           testing::AddGlobalTestEnvironment(
               new content::VideoDecodeAcceleratorTestEnvironment()));
 
   return RUN_ALL_TESTS();
 }