Allow WebExternalTextureLayerClient to work with mailboxes.

cc/layers/texture_layer_unittest.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/layers/texture_layer.h"
 
 #include <string>
 
 #include "base/callback.h"
 #include "cc/base/thread.h"
@@ skipping 216 matching lines @@
                 Release(test_data_.mailbox_name1_,
                         test_data_.sync_point1_,
                         false)).Times(1);
     TextureLayerTest::TearDown();
   }
 
   CommonMailboxObjects test_data_;
 };
 
 TEST_F(TextureLayerWithMailboxTest, ReplaceMailboxOnMainThreadBeforeCommit) {
-  scoped_refptr<TextureLayer> test_layer = TextureLayer::CreateForMailbox();
+  scoped_refptr<TextureLayer> test_layer = TextureLayer::CreateForMailbox(NULL);
   ASSERT_TRUE(test_layer);
 
   EXPECT_CALL(*layer_tree_host_, AcquireLayerTextures()).Times(0);
   EXPECT_CALL(*layer_tree_host_, SetNeedsCommit()).Times(AnyNumber());
   layer_tree_host_->SetRootLayer(test_layer);
   Mock::VerifyAndClearExpectations(layer_tree_host_.get());
 
   EXPECT_CALL(*layer_tree_host_, AcquireLayerTextures()).Times(0);
   EXPECT_CALL(*layer_tree_host_, SetNeedsCommit()).Times(AtLeast(1));
   test_layer->SetTextureMailbox(test_data_.mailbox1_);
@@ skipping 47 matching lines @@
             base::Unretained(this)));
     layer_->SetTextureMailbox(mailbox);
   }
 
   virtual void BeginTest() OVERRIDE {
     gfx::Size bounds(100, 100);
     root_ = Layer::Create();
     root_->SetAnchorPoint(gfx::PointF());
     root_->SetBounds(bounds);
 
-    layer_ = TextureLayer::CreateForMailbox();
+    layer_ = TextureLayer::CreateForMailbox(NULL);
     layer_->SetIsDrawable(true);
     layer_->SetAnchorPoint(gfx::PointF());
     layer_->SetBounds(bounds);
 
     root_->AddChild(layer_);
     layer_tree_host()->SetRootLayer(root_);
     layer_tree_host()->SetViewportSize(bounds);
     SetMailbox('1');
     EXPECT_EQ(0, callback_count_);
 
@@ skipping 198 matching lines @@
   }
 
   virtual unsigned PrepareTexture(ResourceUpdateQueue* queue) OVERRIDE {
     return texture_;
   }
 
   virtual WebKit::WebGraphicsContext3D* Context3d() OVERRIDE {
     return context_;
   }
 
+  virtual bool PrepareTextureMailbox(cc::TextureMailbox* mailbox) OVERRIDE {
+    return false;
+  }
+
   virtual void SetupTree() OVERRIDE {
     scoped_refptr<Layer> root = Layer::Create();
     root->SetBounds(gfx::Size(10, 10));
     root->SetAnchorPoint(gfx::PointF());
     root->SetIsDrawable(true);
 
     texture_layer_ = TextureLayer::Create(this);
     texture_layer_->SetBounds(gfx::Size(10, 10));
     texture_layer_->SetAnchorPoint(gfx::PointF());
     texture_layer_->SetIsDrawable(true);
@@ skipping 63 matching lines @@
 
   // Used on either thread, protected by lock_.
   base::Lock lock_;
   unsigned expected_used_textures_on_commit_;
 };
 
 SINGLE_AND_MULTI_THREAD_TEST_F(TextureLayerClientTest);
 
 }  // namespace
 }  // namespace cc