Cosmetic cleanup to texture_layer mailboxes.

cc/resource_provider.cc

Index: cc/resource_provider.cc
diff --git a/cc/resource_provider.cc b/cc/resource_provider.cc
index fcaa5cf701a8f11ddc668f55c6fc5434b9ca5e24..b466bd0d0959d704c5334f5f96ab685c3de797e4 100644
--- a/cc/resource_provider.cc
+++ b/cc/resource_provider.cc
@@ -241,7 +241,7 @@ ResourceProvider::ResourceId ResourceProvider::createResourceFromExternalTexture
     return id;
 }
 
-ResourceProvider::ResourceId ResourceProvider::createResourceFromTextureMailbox(const std::string& mailbox, const base::Callback<void(unsigned)>& releaseCallback)
+ResourceProvider::ResourceId ResourceProvider::createResourceFromTextureMailbox(const TextureMailbox& mailbox)
 {
     DCHECK(m_threadChecker.CalledOnValidThread());
     // Just store the information. Mailbox will be consumed in lockForRead().
@@ -250,8 +250,8 @@ ResourceProvider::ResourceId ResourceProvider::createResourceFromTextureMailbox(
     Resource resource(textureId, gfx::Size(), 0, GL_LINEAR);
     resource.external = true;
     resource.allocated = true;
-    resource.mailbox.setName(reinterpret_cast<const int8*>(mailbox.data()));
-    resource.mailboxReleaseCallback = releaseCallback;
+    resource.mailbox.setName(mailbox.Data());
+    resource.mailboxCallback = mailbox.callback_;
     m_resources[id] = resource;
     return id;
 }
@@ -301,8 +301,8 @@ void ResourceProvider::deleteResourceInternal(ResourceMap::iterator it)
             GLC(context3d, context3d->deleteTexture(resource->glId));
             syncPoint = context3d->insertSyncPoint();
         }
-        if (!resource->mailboxReleaseCallback.is_null())
-            resource->mailboxReleaseCallback.Run(syncPoint);
+        if (!resource->mailboxCallback.is_null())
+            resource->mailboxCallback.Run(syncPoint);
     }
     if (resource->pixels)
         delete[] resource->pixels;