Remove the usage of omax-vda from video_decode_accelerator_unittest

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 "content/common/gpu/media/rendering_helper.h"
 #include "content/public/common/content_switches.h"
 
 #if defined(OS_WIN)
 #include "content/common/gpu/media/dxva_video_decode_accelerator.h"
 #elif defined(OS_MACOSX)
 #include "content/common/gpu/media/mac_video_decode_accelerator.h"
 #elif defined(OS_CHROMEOS)
 #if defined(ARCH_CPU_ARMEL)
 #include "content/common/gpu/media/exynos_video_decode_accelerator.h"
-#include "content/common/gpu/media/omx_video_decode_accelerator.h"
 #elif defined(ARCH_CPU_X86_FAMILY)
 #include "content/common/gpu/media/vaapi_video_decode_accelerator.h"
 #endif  // ARCH_CPU_ARMEL
 #else
 #error The VideoAccelerator tests are not supported on this platform.
 #endif  // OS_WIN
 
 using media::VideoDecodeAccelerator;
 
 namespace content {
@@ skipping 306 matching lines @@
   CHECK(decoder_deleted());
   CHECK(!decoder_.get());
 #if defined(OS_WIN)
   decoder_.reset(new DXVAVideoDecodeAccelerator(
       this, base::Bind(&DoNothingReturnTrue)));
 #elif defined(OS_MACOSX)
   decoder_.reset(new MacVideoDecodeAccelerator(
       static_cast<CGLContextObj>(rendering_helper_->GetGLContext()), this));
 #elif defined(OS_CHROMEOS)
 #if defined(ARCH_CPU_ARMEL)
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseExynosVda)) {

[yuli, 2013/04/01 10:35:24]

remove kUseExynosVda from content_switches.h?

-    decoder_.reset(
-        new ExynosVideoDecodeAccelerator(
-            static_cast<EGLDisplay>(rendering_helper_->GetGLDisplay()),
-            static_cast<EGLContext>(rendering_helper_->GetGLContext()),
-            this, base::Bind(&DoNothingReturnTrue)));
-  } else {
-    decoder_.reset(
-        new OmxVideoDecodeAccelerator(
-            static_cast<EGLDisplay>(rendering_helper_->GetGLDisplay()),
-            static_cast<EGLContext>(rendering_helper_->GetGLContext()),
-            this, base::Bind(&DoNothingReturnTrue)));
-  }
+  decoder_.reset(
+      new ExynosVideoDecodeAccelerator(
+          static_cast<EGLDisplay>(rendering_helper_->GetGLDisplay()),
+          static_cast<EGLContext>(rendering_helper_->GetGLContext()),
+          this, base::Bind(&DoNothingReturnTrue)));
 #elif defined(ARCH_CPU_X86_FAMILY)
   decoder_.reset(new VaapiVideoDecodeAccelerator(
       static_cast<Display*>(rendering_helper_->GetGLDisplay()),
       static_cast<GLXContext>(rendering_helper_->GetGLContext()),
       this, base::Bind(&DoNothingReturnTrue)));
 #endif  // ARCH_CPU_ARMEL
 #endif  // OS_WIN
   CHECK(decoder_.get());
   SetState(CS_DECODER_SET);
   if (decoder_deleted())
@@ skipping 565 matching lines @@
 
   CommandLine::SwitchMap switches = cmd_line->GetSwitches();
   for (CommandLine::SwitchMap::const_iterator it = switches.begin();
        it != switches.end(); ++it) {
     if (it->first == "test_video_data") {
       content::test_video_data = it->second.c_str();
       continue;
     }
     if (it->first == "v" || it->first == "vmodule")
       continue;
-#if defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL)
-    if (it->first == switches::kUseExynosVda)
-      continue;
-#endif
     LOG(FATAL) << "Unexpected switch: " << it->first << ":" << it->second;
   }
 
   base::ShadowingAtExitManager at_exit_manager;
   content::RenderingHelper::InitializePlatform();
 
 #if defined(OS_WIN)
   content::DXVAVideoDecodeAccelerator::PreSandboxInitialization();
 #elif defined(OS_CHROMEOS)
 #if defined(ARCH_CPU_ARMEL)
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseExynosVda))
-    content::ExynosVideoDecodeAccelerator::PreSandboxInitialization();
-  else
-    content::OmxVideoDecodeAccelerator::PreSandboxInitialization();
+  content::ExynosVideoDecodeAccelerator::PreSandboxInitialization();
 #elif defined(ARCH_CPU_X86_FAMILY)
   content::VaapiVideoDecodeAccelerator::PreSandboxInitialization();
 #endif  // ARCH_CPU_ARMEL
 #endif  // OS_CHROMEOS
 
   return RUN_ALL_TESTS();
 }