Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

cc/test/layer_tree_pixel_test.h

 // Copyright 2013 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.
 
 #ifndef CC_TEST_LAYER_TREE_PIXEL_TEST_H_
 #define CC_TEST_LAYER_TREE_PIXEL_TEST_H_
 
 #include <vector>
 
 #include "base/files/file_path.h"
@@ skipping 23 matching lines @@
   enum PixelTestType {
     PIXEL_TEST_GL,
     PIXEL_TEST_SOFTWARE,
   };
 
  protected:
   LayerTreePixelTest();
   ~LayerTreePixelTest() override;
 
   scoped_ptr<OutputSurface> CreateOutputSurface() override;
-  void WillActivateTreeOnThread(LayerTreeHostImpl* impl) override;
+  void CommitCompleteOnThread(LayerTreeHostImpl* impl) override;
 
   virtual scoped_ptr<CopyOutputRequest> CreateCopyOutputRequest();
 
   void ReadbackResult(scoped_ptr<CopyOutputResult> result);
 
   void BeginTest() override;
   void SetupTree() override;
   void AfterTest() override;
   void EndTest() override;
 
@@ skipping 54 matching lines @@
   scoped_ptr<SkBitmap> result_bitmap_;
   std::vector<scoped_refptr<TextureLayer>> texture_layers_;
   int pending_texture_mailbox_callbacks_;
   bool impl_side_painting_;
   gfx::Vector2d enlarge_texture_amount_;
 };
 
 }  // namespace cc
 
 #endif  // CC_TEST_LAYER_TREE_PIXEL_TEST_H_