cc: Use BeginFrameArgs

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/layers/texture_layer_client.h"
@@ skipping 1004 matching lines @@
   virtual void BeginTest() OVERRIDE {
     callback_count_ = 0;
 
     // Set the mailbox on the main thread.
     SetMailbox('1');
     EXPECT_EQ(0, callback_count_);
 
     PostSetNeedsCommitToMainThread();
   }
 
-  virtual void DidCommitAndDrawFrame() OVERRIDE {
+  virtual void DidCommit() OVERRIDE {
     switch (layer_tree_host()->source_frame_number()) {
       case 1:
         // Delete the TextureLayer on the main thread while the mailbox is in
         // the impl tree.
         layer_->RemoveFromParent();
         layer_ = NULL;
         break;
     }
   }
 
@@ skipping 47 matching lines @@
   virtual void BeginTest() OVERRIDE {
     callback_count_ = 0;
 
     // Set the mailbox on the main thread.
     SetMailbox('1');
     EXPECT_EQ(0, callback_count_);
 
     PostSetNeedsCommitToMainThread();
   }
 
-  virtual void DidCommitAndDrawFrame() OVERRIDE {
-    switch (layer_tree_host()->source_frame_number()) {
-      case 1:
+  virtual void DidCommit() OVERRIDE {
+    if (layer_tree_host()->source_frame_number() == 1) {
         // Remove the TextureLayer on the main thread while the mailbox is in
         // the impl tree, but don't delete the TextureLayer until after the impl
         // tree side is deleted.
         layer_->RemoveFromParent();
-        break;
-      case 2:
-        layer_ = NULL;
-        break;
     }
   }
 
+  virtual void SwapBuffersCompleteOnThread(LayerTreeHostImpl *impl) OVERRIDE {
+    if (impl->active_tree()->source_frame_number() == 1) {
+      proxy()->MainThreadTaskRunner()->PostTask(
+        FROM_HERE,
+        base::Bind(
+            &TextureLayerWithMailboxImplThreadDeleted::DeleteTextureLayer,
+            base::Unretained(this)));
+    }
+  }
+
+  virtual void DeleteTextureLayer() {
+    layer_ = NULL;
+  }
+
   virtual void AfterTest() OVERRIDE {
     EXPECT_EQ(1, callback_count_);
   }
 
  private:
   int callback_count_;
   scoped_refptr<Layer> root_;
   scoped_refptr<TextureLayer> layer_;
 };
 
 SINGLE_AND_MULTI_THREAD_DIRECT_RENDERER_TEST_F(
     TextureLayerWithMailboxImplThreadDeleted);
 
 }  // namespace
 }  // namespace cc