Update from chromium https://crrev.com/302282

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 12 matching lines @@
 namespace cc {
 class CopyOutputRequest;
 class CopyOutputResult;
 class LayerTreeHost;
 class PixelComparator;
 class SolidColorLayer;
 class TextureLayer;
 class TextureMailbox;
 
 class LayerTreePixelTest : public LayerTreeTest {
+ public:
+  enum PixelTestType {
+    PIXEL_TEST_GL,
+    PIXEL_TEST_SOFTWARE,
+  };
+
  protected:
   LayerTreePixelTest();
   virtual ~LayerTreePixelTest();
 
   scoped_ptr<OutputSurface> CreateOutputSurface(bool fallback) 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;
 
   void TryEndTest();
 
   scoped_refptr<SolidColorLayer> CreateSolidColorLayer(const gfx::Rect& rect,
                                                        SkColor color);
   scoped_refptr<SolidColorLayer> CreateSolidColorLayerWithBorder(
       const gfx::Rect& rect,
       SkColor color,
       int border_width,
       SkColor border_color);
   scoped_refptr<TextureLayer> CreateTextureLayer(const gfx::Rect& rect,
                                                  const SkBitmap& bitmap);
 
-  enum PixelTestType {
-    PIXEL_TEST_GL,
-    PIXEL_TEST_SOFTWARE,
-  };
-
   void RunPixelTest(PixelTestType type,
                     scoped_refptr<Layer> content_root,
                     base::FilePath file_name);
 
+  void RunSingleThreadedPixelTest(PixelTestType test_type,
+                                  scoped_refptr<Layer> content_root,
+                                  base::FilePath file_name);
+
   void RunPixelTestWithReadbackTarget(PixelTestType type,
                                       scoped_refptr<Layer> content_root,
                                       Layer* target,
                                       base::FilePath file_name);
 
   scoped_ptr<SkBitmap> CopyTextureMailboxToBitmap(
       const gfx::Size& size,
       const TextureMailbox& texture_mailbox);
 
   void CopyBitmapToTextureMailboxAsTexture(
@@ skipping 19 matching lines @@
   base::FilePath ref_file_;
   scoped_ptr<SkBitmap> result_bitmap_;
   std::vector<scoped_refptr<TextureLayer>> texture_layers_;
   int pending_texture_mailbox_callbacks_;
   bool impl_side_painting_;
 };
 
 }  // namespace cc
 
 #endif  // CC_TEST_LAYER_TREE_PIXEL_TEST_H_