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

cc/test/layer_tree_pixel_test.cc

 // Copyright 2013 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.
 
 #include "cc/test/layer_tree_pixel_test.h"
 
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "cc/base/switches.h"
 #include "cc/layers/solid_color_layer.h"
@@ skipping 223 matching lines @@
 
   unsigned texture_id = context3d->createTexture();
   context3d->bindTexture(GL_TEXTURE_2D, texture_id);
   context3d->texParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
   context3d->texParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
   context3d->texParameteri(
       GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
   context3d->texParameteri(
       GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
   context3d->consumeTextureCHROMIUM(texture_mailbox.target(),
-                                    texture_mailbox.data());
+                                    texture_mailbox.mailbox().name);
   context3d->bindTexture(GL_TEXTURE_2D, 0);
 
   unsigned fbo = context3d->createFramebuffer();
   context3d->bindFramebuffer(GL_FRAMEBUFFER, fbo);
   context3d->framebufferTexture2D(GL_FRAMEBUFFER,
                                   GL_COLOR_ATTACHMENT0,
                                   GL_TEXTURE_2D,
                                   texture_id,
                                   0);
   EXPECT_EQ(static_cast<unsigned>(GL_FRAMEBUFFER_COMPLETE),
@@ skipping 107 matching lines @@
                           GL_UNSIGNED_BYTE,
                           gl_pixels.get());
   }
 
   gpu::Mailbox mailbox;
   context3d->genMailboxCHROMIUM(mailbox.name);
   context3d->produceTextureCHROMIUM(GL_TEXTURE_2D, mailbox.name);
   context3d->bindTexture(GL_TEXTURE_2D, 0);
   uint32 sync_point = context3d->insertSyncPoint();
 
-  *texture_mailbox = TextureMailbox(mailbox, sync_point);
+  *texture_mailbox = TextureMailbox(mailbox, GL_TEXTURE_2D, sync_point);
   *release_callback = SingleReleaseCallback::Create(
       base::Bind(&LayerTreePixelTest::ReleaseTextureMailbox,
                  base::Unretained(this),
                  base::Passed(&context3d),
                  texture_id));
 }
 
 }  // namespace cc