Sync ui/events to chromium @ https://codereview.chromium.org/1210203002

ui/events/test/test_event_target.h

Index: ui/events/test/test_event_target.h
diff --git a/ui/events/test/test_event_target.h b/ui/events/test/test_event_target.h
index 1a46ee2d15b8b805dcaf66eba5d7df0e16afe066..06ddc9914262d7a2c805cda0b7376bb41c17fbb3 100644
--- a/ui/events/test/test_event_target.h
+++ b/ui/events/test/test_event_target.h
@@ -50,14 +50,16 @@ class TestEventTarget : public EventTarget {
     target_name_ = target_name;
   }
 
+  // EventTarget:
+  EventTargeter* GetEventTargeter() override;
+
  protected:
   bool Contains(TestEventTarget* target) const;
 
   // EventTarget:
   bool CanAcceptEvent(const ui::Event& event) override;
   EventTarget* GetParentTarget() override;
-  scoped_ptr<EventTargetIterator> GetChildIterator() override;
-  EventTargeter* GetEventTargeter() override;
+  scoped_ptr<EventTargetIterator> GetChildIterator() const override;
 
   // EventHandler:
   void OnEvent(Event* event) override;