Move scroll event handlers from layer to layer tree view.

cc/test/layer_tree_json_parser_unittest.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 <stddef.h>
 
 #include "cc/layers/layer.h"
 #include "cc/test/fake_impl_task_runner_provider.h"
@@ skipping 24 matching lines @@
       EXPECT_EQ(layer_impl->position(), layer->position()));
   RETURN_IF_EXPECTATION_FAILS(EXPECT_TRANSFORMATION_MATRIX_EQ(
       layer_impl->transform(), layer->transform()));
   RETURN_IF_EXPECTATION_FAILS(EXPECT_EQ(layer_impl->contents_opaque(),
                                         layer->contents_opaque()));
   RETURN_IF_EXPECTATION_FAILS(EXPECT_EQ(layer_impl->scrollable(),
                                         layer->scrollable()));
   RETURN_IF_EXPECTATION_FAILS(EXPECT_FLOAT_EQ(layer_impl->opacity(),
                                               layer->opacity()));
   RETURN_IF_EXPECTATION_FAILS(
-      EXPECT_EQ(layer_impl->have_scroll_event_handlers(),
-                layer->have_scroll_event_handlers()));
-  RETURN_IF_EXPECTATION_FAILS(
       EXPECT_EQ(layer_impl->touch_event_handler_region(),
                 layer->touch_event_handler_region()));
 
   for (size_t i = 0; i < layer_impl->children().size(); ++i) {
     RETURN_IF_EXPECTATION_FAILS(EXPECT_TRUE(LayerTreesMatch(
         layer_impl->children()[i].get(), layer->children()[i].get())));
   }
 
   return true;
 #undef RETURN_IF_EXPECTATION_FAILS
@@ skipping 15 matching lines @@
   scoped_ptr<LayerImpl> root_impl(LayerImpl::Create(tree, 1));
   scoped_ptr<LayerImpl> parent(LayerImpl::Create(tree, 2));
   scoped_ptr<LayerImpl> child(LayerImpl::Create(tree, 3));
 
   root_impl->SetBounds(gfx::Size(100, 100));
   parent->SetBounds(gfx::Size(50, 50));
   child->SetBounds(gfx::Size(40, 40));
 
   parent->SetPosition(gfx::PointF(25.f, 25.f));
 
-  child->SetHaveScrollEventHandlers(true);
-
   parent->AddChild(std::move(child));
   root_impl->AddChild(std::move(parent));
   tree->SetRootLayer(std::move(root_impl));
 
   std::string json = host_impl.LayerTreeAsJson();
   scoped_refptr<Layer> root = ParseTreeFromJson(json, NULL);
   ASSERT_TRUE(root.get());
   EXPECT_TRUE(LayerTreesMatch(host_impl.RootLayer(), root.get()));
 }
 
@@ skipping 19 matching lines @@
   root_impl->AddChild(std::move(touch_layer));
   tree->SetRootLayer(std::move(root_impl));
 
   std::string json = host_impl.LayerTreeAsJson();
   scoped_refptr<Layer> root = ParseTreeFromJson(json, NULL);
   ASSERT_TRUE(root.get());
   EXPECT_TRUE(LayerTreesMatch(host_impl.RootLayer(), root.get()));
 }
 
 }  // namespace cc