Cosmetic cleanup to texture_layer mailboxes.

cc/texture_layer_impl.h

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CC_TEXTURE_LAYER_IMPL_H_
 #define CC_TEXTURE_LAYER_IMPL_H_
 
 #include <string>
 
 #include "base/callback.h"
@@ skipping 23 matching lines @@
     void setPremultipliedAlpha(bool premultipliedAlpha) { m_premultipliedAlpha = premultipliedAlpha; }
     void setFlipped(bool flipped) { m_flipped = flipped; }
     void setUVRect(const gfx::RectF& rect) { m_uvRect = rect; }
 
     // 1--2
     // |  |
     // 0--3
     void setVertexOpacity(const float vertexOpacity[4]);
     virtual bool canClipSelf() const OVERRIDE;
 
-    void setTextureMailbox(const std::string& mailboxName, const base::Callback<void(unsigned)>& releaseCallback);
+    void setTextureMailbox(const TextureMailbox&);
 
 private:
     TextureLayerImpl(LayerTreeImpl* treeImpl, int id, bool usesMailbox);
 
     virtual const char* layerTypeAsString() const OVERRIDE;
 
     unsigned m_textureId;
     ResourceProvider::ResourceId m_externalTextureResource;
     bool m_premultipliedAlpha;
     bool m_flipped;
     gfx::RectF m_uvRect;
     float m_vertexOpacity[4];
 
     bool m_hasPendingMailbox;
-    std::string m_pendingMailboxName;
-    base::Callback<void(unsigned)> m_pendingMailboxReleaseCallback;
+    TextureMailbox m_pendingTextureMailbox;
     bool m_usesMailbox;
 };
 
 }
 
 #endif  // CC_TEXTURE_LAYER_IMPL_H_