VAAPI Wrapper: refactor management of drm file

content/common/gpu/media/vaapi_wrapper.h

Index: content/common/gpu/media/vaapi_wrapper.h
diff --git a/content/common/gpu/media/vaapi_wrapper.h b/content/common/gpu/media/vaapi_wrapper.h
index cd2d2a6d8fa14b8e54b348690c4522c115895307..cb547e9e311c160f72a52f0da2a91d94c1c82fad 100644
--- a/content/common/gpu/media/vaapi_wrapper.h
+++ b/content/common/gpu/media/vaapi_wrapper.h
@@ -191,6 +191,9 @@ class CONTENT_EXPORT VaapiWrapper {
                    VASurfaceID va_surface_id_dest,
                    const gfx::Size& dest_size);
 
+  // Initialize static data before sandbox is enabled.
+  static void PreSandboxInitialization();
+
  private:
   struct ProfileInfo {
     VAProfile va_profile;
@@ -309,8 +312,9 @@ class CONTENT_EXPORT VaapiWrapper {
   VABufferID va_vpp_buffer_id_;
 
 #if defined(USE_OZONE)
-  // Drm file used to obtain access to the driver interface by VA.
-  base::File drm_file_;
+  // Singleton variable to store drm file used to obtain access to the driver
+  // interface by VA.
+  static base::LazyInstance<base::File> drm_file_;

[dnicoara, 2015/05/07 21:17:10]

You use base::ScopedFD rather than base::File for simplicity.

[hshi1, 2015/05/07 21:50:17]

Done.

 #endif  // USE_OZONE
 
   // Singleton variable to store supported profile information for encode and