[Ozone] Extends the lifetime of VaapiWrapper

content/common/gpu/media/vaapi_picture.cc

Index: content/common/gpu/media/vaapi_picture.cc
diff --git a/content/common/gpu/media/vaapi_picture.cc b/content/common/gpu/media/vaapi_picture.cc
index cd886c06ebfc601c31f1dd9fd4a053cf3433d562..511544f182be3317152bcfe4ffd2d98264b3ae95 100644
--- a/content/common/gpu/media/vaapi_picture.cc
+++ b/content/common/gpu/media/vaapi_picture.cc
@@ -16,23 +16,23 @@
 namespace content {
 
 // static
-linked_ptr<VaapiPicture> VaapiPicture::CreatePicture(
-    VaapiWrapper* vaapi_wrapper,
+scoped_refptr<VaapiPicture> VaapiPicture::CreatePicture(
+    scoped_refptr<VaapiWrapper> vaapi_wrapper,
     const base::Callback<bool(void)> make_context_current,
     int32 picture_buffer_id,
     uint32 texture_id,
     const gfx::Size& size) {
-  linked_ptr<VaapiPicture> picture;
+  scoped_refptr<VaapiPicture> picture;
 #if defined(USE_X11)
-  picture.reset(new VaapiTFPPicture(vaapi_wrapper, make_context_current,
-                                    picture_buffer_id, texture_id, size));
+  picture = new VaapiTFPPicture(vaapi_wrapper, make_context_current,
+                                picture_buffer_id, texture_id, size);
 #elif defined(USE_OZONE)
-  picture.reset(new VaapiDrmPicture(vaapi_wrapper, make_context_current,
-                                    picture_buffer_id, texture_id, size));
+  picture = new VaapiDrmPicture(vaapi_wrapper, make_context_current,
+                                picture_buffer_id, texture_id, size);
 #endif  // USE_X11
 
   if (picture.get() && !picture->Initialize())
-    picture.reset();
+    picture = nullptr;
 
   return picture;
 }