Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

cc/test/layer_tree_json_parser.cc

 // 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.
 
 #include "cc/test/layer_tree_json_parser.h"
 
 #include "base/test/values_test_util.h"
 #include "base/values.h"
 #include "cc/layers/content_layer.h"
 #include "cc/layers/layer.h"
@@ skipping 138 matching lines @@
     new_layer->SetTouchEventHandlerRegion(touch_region);
   }
 
   if (dict->HasKey("ScrollBlocksOn")) {
     success &= dict->GetList("ScrollBlocksOn", &list);
     ScrollBlocksOn blocks;
     std::string str;
     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;
     }
   }
 
   success &= dict->GetList("DrawTransform", &list);
   double transform[16];
   for (int i = 0; i < 16; ++i)
     success &= list->GetDouble(i, &transform[i]);
 
@@ skipping 15 matching lines @@
 
 }  // namespace
 
 scoped_refptr<Layer> ParseTreeFromJson(std::string json,
                                        ContentLayerClient* content_client) {
   scoped_ptr<base::Value> val = base::test::ParseJson(json);
   return ParseTreeFromValue(val.get(), content_client);
 }
 
 }  // namespace cc