Add gpu::MailboxHolder to hold state for a gpu::Mailbox

content/common/gpu/client/gl_helper.cc

Index: content/common/gpu/client/gl_helper.cc
diff --git a/content/common/gpu/client/gl_helper.cc b/content/common/gpu/client/gl_helper.cc
index 3ea2557a69dbb970af8e6b656a62001b30e82d50..be778acb40f6a12db4144ede3b8a68efe10e3c5a 100644
--- a/content/common/gpu/client/gl_helper.cc
+++ b/content/common/gpu/client/gl_helper.cc
@@ -18,6 +18,7 @@
 #include "content/common/gpu/client/gl_helper_scaling.h"
 #include "gpu/command_buffer/client/context_support.h"
 #include "gpu/command_buffer/common/mailbox.h"
+#include "gpu/command_buffer/common/mailbox_holder.h"
 #include "media/base/video_frame.h"
 #include "media/base/video_util.h"
 #include "third_party/WebKit/public/platform/WebCString.h"
@@ -706,19 +707,17 @@ void GLHelper::WaitSyncPoint(uint32 sync_point) {
   context_->waitSyncPoint(sync_point);
 }
 
-gpu::Mailbox GLHelper::ProduceMailboxFromTexture(blink::WebGLId texture_id,
-                                                 uint32* sync_point) {
+gpu::MailboxHolder GLHelper::ProduceMailboxHolderFromTexture(
+    blink::WebGLId texture_id) {
   gpu::Mailbox mailbox;
   context_->genMailboxCHROMIUM(mailbox.name);
-  if (mailbox.IsZero()) {
-    *sync_point = 0;
-    return mailbox;
-  }
+  if (mailbox.IsZero())
+    return gpu::MailboxHolder();
   content::ScopedTextureBinder<GL_TEXTURE_2D> texture_binder(context_,
                                                              texture_id);
   context_->produceTextureCHROMIUM(GL_TEXTURE_2D, mailbox.name);
-  *sync_point = context_->insertSyncPoint();
-  return mailbox;
+  return gpu::MailboxHolder(
+      mailbox, GL_TEXTURE_2D, context_->insertSyncPoint());
 }
 
 blink::WebGLId GLHelper::ConsumeMailboxToTexture(const gpu::Mailbox& mailbox,