cc: Move TextureMailbox::ReleaseCallback to SingleReleaseCallback.

content/renderer/browser_plugin/browser_plugin_compositing_helper.cc

Index: content/renderer/browser_plugin/browser_plugin_compositing_helper.cc
diff --git a/content/renderer/browser_plugin/browser_plugin_compositing_helper.cc b/content/renderer/browser_plugin/browser_plugin_compositing_helper.cc
index 7d02f31aea9d198a26af657707d29747ba11cc80..7c2b732be2f9e3c5db2e2c2e0f66b801ff83d16a 100644
--- a/content/renderer/browser_plugin/browser_plugin_compositing_helper.cc
+++ b/content/renderer/browser_plugin/browser_plugin_compositing_helper.cc
@@ -8,6 +8,7 @@
 #include "cc/layers/solid_color_layer.h"
 #include "cc/layers/texture_layer.h"
 #include "cc/output/context_provider.h"
+#include "cc/resources/scoped_release_callback.h"
 #include "content/common/browser_plugin/browser_plugin_messages.h"
 #include "content/common/gpu/client/context_provider_command_buffer.h"
 #include "content/renderer/browser_plugin/browser_plugin_manager.h"
@@ -238,21 +239,20 @@ void BrowserPluginCompositingHelper::OnBuffersSwappedPrivate(
   }
 
   cc::TextureMailbox texture_mailbox;
+  scoped_ptr<cc::ScopedReleaseCallback> release_callback;
   if (current_mailbox_valid) {
-    cc::TextureMailbox::ReleaseCallback callback =
+    release_callback = cc::ScopedReleaseCallback::Create(
         base::Bind(&BrowserPluginCompositingHelper::MailboxReleased,
                    scoped_refptr<BrowserPluginCompositingHelper>(this),
-                   mailbox);
-    if (is_software_frame) {
-      texture_mailbox = cc::TextureMailbox(mailbox.shared_memory,
-                                           mailbox.size, callback);
-    } else {
-      texture_mailbox = cc::TextureMailbox(mailbox.name, callback, sync_point);
-    }
+                   mailbox)).Pass();
+    if (is_software_frame)
+      texture_mailbox = cc::TextureMailbox(mailbox.shared_memory, mailbox.size);
+    else
+      texture_mailbox = cc::TextureMailbox(mailbox.name, sync_point);
   }
 
   texture_layer_->SetFlipped(!is_software_frame);
-  texture_layer_->SetTextureMailbox(texture_mailbox);
+  texture_layer_->SetTextureMailbox(texture_mailbox, release_callback.Pass());
   texture_layer_->SetNeedsDisplay();
   last_mailbox_valid_ = current_mailbox_valid;
 }