Revert 150007 - Only dlopen() OMX/VAAPI libs in the GPU process, and only lazily dlsym() their symb…

content/gpu/gpu_main.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 <stdlib.h>
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
@@ skipping 12 matching lines @@
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/main_function_params.h"
 #include "crypto/hmac.h"
 #include "ui/gl/gl_surface.h"
 #include "ui/gl/gl_switches.h"
 
 #if defined(OS_WIN)
 #include "content/common/gpu/media/dxva_video_decode_accelerator.h"
 #include "sandbox/win/src/sandbox.h"
-#elif defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL)
-#include "content/common/gpu/media/omx_video_decode_accelerator.h"
-#elif defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY)
-#include "content/common/gpu/media/vaapi_video_decode_accelerator.h"
 #endif
 
 #if defined(USE_X11)
 #include "ui/base/x/x11_util.h"
 #endif
 
 #if defined(OS_LINUX)
 #include "content/public/common/sandbox_init.h"
 #endif
 
@@ skipping 99 matching lines @@
     unsigned char key = '\0';
     bool ret = hmac.Init(&key, sizeof(key));
     (void) ret;
   }
 
 #if defined(OS_LINUX)
   {
     TRACE_EVENT0("gpu", "Initialize sandbox");
     bool do_init_sandbox = true;
 
-#if defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL)
-    OmxVideoDecodeAccelerator::PreSandboxInitialization();
-#elif defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY)
-    VaapiVideoDecodeAccelerator::PreSandboxInitialization();
-#endif
-
 #if defined(OS_CHROMEOS) && defined(NDEBUG)
     // On Chrome OS and when not on a debug build, initialize
     // the GPU process' sandbox only for Intel GPUs.
     do_init_sandbox = gpu_info.gpu.vendor_id == 0x8086;   // Intel GPU.
 #endif
 
     if (do_init_sandbox) {
       content::InitializeSandbox();
     }
   }
@@ skipping 56 matching lines @@
 
   {
     TRACE_EVENT0("gpu", "Run Message Loop");
     main_message_loop.Run();
   }
 
   child_thread->StopWatchdog();
 
   return 0;
 }