Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

cc/test/layer_tree_pixel_test.cc

Index: cc/test/layer_tree_pixel_test.cc
diff --git a/cc/test/layer_tree_pixel_test.cc b/cc/test/layer_tree_pixel_test.cc
index dbb9ba5c4546d18e1d622a5e09fff0fce78637b4..f7ab9c27e36fa731563fdda72f6181d558ddd197 100644
--- a/cc/test/layer_tree_pixel_test.cc
+++ b/cc/test/layer_tree_pixel_test.cc
@@ -63,8 +63,10 @@ scoped_ptr<OutputSurface> LayerTreePixelTest::CreateOutputSurface() {
   return output_surface.Pass();
 }
 
-void LayerTreePixelTest::WillActivateTreeOnThread(LayerTreeHostImpl* impl) {
-  if (impl->sync_tree()->source_frame_number() != 0)
+void LayerTreePixelTest::CommitCompleteOnThread(LayerTreeHostImpl* impl) {
+  LayerTreeImpl* commit_tree =
+      impl->pending_tree() ? impl->pending_tree() : impl->active_tree();
+  if (commit_tree->source_frame_number() != 0)
     return;
 
   DirectRenderer* renderer = static_cast<DirectRenderer*>(impl->renderer());