cc: Fix race in SurfaceLayer unittests.

cc/layers/surface_layer_unittest.cc

 // Copyright 2014 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 <set>
 #include <vector>
 
 #include "base/message_loop/message_loop_proxy.h"
 #include "cc/layers/solid_color_layer.h"
 #include "cc/layers/surface_layer.h"
@@ skipping 154 matching lines @@
     SurfaceSequence expected(1u, 1u);
     EXPECT_TRUE(required_id_ == SurfaceId(1));
     EXPECT_EQ(1u, required_set_.size());
     EXPECT_TRUE(required_set_.count(expected));
 
     gfx::Size bounds(100, 100);
     layer_tree_host()->SetViewportSize(bounds);
     PostSetNeedsCommitToMainThread();
   }
 
-  void DidCommit() override {
+  void DidCommitAndDrawFrame() override {
     base::MessageLoopProxy::current()->PostTask(
         FROM_HERE, base::Bind(&SurfaceLayerSwapPromise::ChangeTree,
                               base::Unretained(this)));
   }
 
   void ChangeTree() {
     ++commit_count_;
     switch (commit_count_) {
       case 1:
         // Remove SurfaceLayer from tree to cause SwapPromise to be created.
@@ skipping 44 matching lines @@
   SurfaceId required_id_;
   std::set<SurfaceSequence> required_set_;
 };
 
 // TODO(jbauman): Reenable on single thread once http://crbug.com/421923 is
 // fixed.
 MULTI_THREAD_TEST_F(SurfaceLayerSwapPromise);
 
 }  // namespace
 }  // namespace cc