Update from chromium 62675d9fb31fb8cedc40f68e78e8445a74f362e7

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 41 matching lines @@
                                                        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 {
-    GL_WITH_DEFAULT,
-    GL_WITH_BITMAP,
-    SOFTWARE_WITH_DEFAULT,
-    SOFTWARE_WITH_BITMAP
+    PIXEL_TEST_GL,
+    PIXEL_TEST_SOFTWARE,
   };
 
   void RunPixelTest(PixelTestType 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);
@@ skipping 25 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_