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

content/common/gpu/media/vaapi_h264_decoder.h

 // 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.
 //
 // This file contains an implementation of a class that provides H264 decode
 // support for use with VAAPI hardware video decode acceleration on Intel
 // systems.
 
 #ifndef CONTENT_COMMON_GPU_MEDIA_VAAPI_H264_DECODER_H_
 #define CONTENT_COMMON_GPU_MEDIA_VAAPI_H264_DECODER_H_
@@ skipping 111 matching lines @@
 
   // Return dimensions for output buffer (texture) allocation.
   // Valid only after a successful DecodeInitial().
   int pic_height() { return pic_height_; }
   int pic_width() { return pic_width_; }
 
   // Return the number of output pictures required for decoding.
   // Valid after a successful DecodeInitial().
   static size_t GetRequiredNumOfPictures();
 
-  // Do any necessary initialization before the sandbox is enabled.
-  static void PreSandboxInitialization();
-
-  // Lazily initialize static data after sandbox is enabled.  Return false on
-  // init failure.
-  static bool PostSandboxInitialization();
-
  private:
   // We need to keep at least kDPBMaxSize pictures in DPB for
   // reference/to display later and an additional one for the one currently
   // being decoded. We also ask for some additional ones since VDA needs
   // to accumulate a few ready-to-output pictures before it actually starts
   // displaying and giving them back. +2 instead of +1 because of subjective
   // smoothness improvement during testing.
   enum { kNumReqPictures = H264DPB::kDPBMaxSize +
       media::limits::kMaxVideoFrames + 2 };
 
@@ skipping 180 matching lines @@
   VAConfigID va_config_id_;
   VAContextID va_context_id_;
   VAProfile profile_;
 
   // Allocated VASurfaces.
   VASurfaceID va_surface_ids_[kNumReqPictures];
 
   // Called by decoder when a picture should be outputted.
   OutputPicCB output_pic_cb_;
 
-  // Has static initialization of pre-sandbox components completed successfully?
-  static bool pre_sandbox_init_done_;
-
   DISALLOW_COPY_AND_ASSIGN(VaapiH264Decoder);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_MEDIA_VAAPI_H264_DECODER_H_