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

cc/trees/layer_tree_host_perftest.cc

 // 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.
 
 #include "cc/trees/layer_tree_host.h"
 
 #include <sstream>
 
 #include "base/file_util.h"
 #include "base/files/file_path.h"
@@ skipping 225 matching lines @@
   ReadTestFile("long_scrollable_page");
   RunTest(false, false, false);
 }
 
 TEST_F(ScrollingLayerTreePerfTest, LongScrollablePageThreadedImplSide) {
   SetTestName("long_scrollable_page_threaded_impl_side");
   ReadTestFile("long_scrollable_page");
   RunTestWithImplSidePainting();
 }
 
-static void EmptyReleaseCallback(unsigned sync_point, bool lost_resource) {}
+static void EmptyReleaseCallback(uint32 sync_point, bool lost_resource) {}
 
 // Simulates main-thread scrolling on each frame.
 class BrowserCompositorInvalidateLayerTreePerfTest
     : public LayerTreeHostPerfTestJsonReader {
  public:
   BrowserCompositorInvalidateLayerTreePerfTest()
       : next_sync_point_(1) {
   }
 
   virtual void BuildTree() OVERRIDE {
     LayerTreeHostPerfTestJsonReader::BuildTree();
     tab_contents_ =
         static_cast<TextureLayer*>(
             layer_tree_host()->root_layer()->children()[0]->
                                              children()[0]->
                                              children()[0]->
                                              children()[0].get());
     ASSERT_TRUE(tab_contents_.get());
   }
 
   virtual void Layout() OVERRIDE {
     gpu::Mailbox gpu_mailbox;
     std::ostringstream name_stream;
     name_stream << "name" << next_sync_point_;
     const char* name = name_stream.str().c_str();
     memcpy(gpu_mailbox.name, name, strlen(name) + 1);
     scoped_ptr<SingleReleaseCallback> callback = SingleReleaseCallback::Create(
         base::Bind(&EmptyReleaseCallback));
-    TextureMailbox mailbox(gpu_mailbox, next_sync_point_);
+    TextureMailbox mailbox(gpu_mailbox, GL_TEXTURE_2D, next_sync_point_);
     next_sync_point_++;
 
     tab_contents_->SetTextureMailbox(mailbox, callback.Pass());
   }
 
  private:
   scoped_refptr<TextureLayer> tab_contents_;
   unsigned next_sync_point_;
 };
 
@@ skipping 72 matching lines @@
 
 TEST_F(PageScaleImplSidePaintingPerfTest, HeavyPage) {
   measure_commit_cost_ = true;
   SetTestName("heavy_page_page_scale");
   ReadTestFile("heavy_layer_tree");
   RunTestWithImplSidePainting();
 }
 
 }  // namespace
 }  // namespace cc