Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

cc/test/layer_tree_json_parser.cc

Index: cc/test/layer_tree_json_parser.cc
diff --git a/cc/test/layer_tree_json_parser.cc b/cc/test/layer_tree_json_parser.cc
index b0b81f7e803fe3260300d79ae4263c6418b54619..efe70a06c757448b1c9b34d5ba66498dbaddb914 100644
--- a/cc/test/layer_tree_json_parser.cc
+++ b/cc/test/layer_tree_json_parser.cc
@@ -156,11 +156,11 @@ scoped_refptr<Layer> ParseTreeFromValue(base::Value* val,
     for (size_t i = 0; i < list->GetSize(); i++) {
       success &= list->GetString(i, &str);
       if (str == "StartTouch")
-        blocks |= SCROLL_BLOCKS_ON_START_TOUCH;
+        blocks |= ScrollBlocksOnStartTouch;
       else if (str == "WheelEvent")
-        blocks |= SCROLL_BLOCKS_ON_WHEEL_EVENT;
+        blocks |= ScrollBlocksOnWheelEvent;
       else if (str == "ScrollEvent")
-        blocks |= SCROLL_BLOCKS_ON_SCROLL_EVENT;
+        blocks |= ScrollBlocksOnScrollEvent;
       else
         success = false;
     }