x11: Cleanup how valuators are set for X events in tests.

ui/events/test/events_test_utils_x11.h

Index: ui/events/test/events_test_utils_x11.h
diff --git a/ui/events/test/events_test_utils_x11.h b/ui/events/test/events_test_utils_x11.h
index 4faa8f49c4f7b8b3c85381ab43f123de955b000b..2525f9ae1a33d6e0d9e3e9a8c2d399c355b380ea 100644
--- a/ui/events/test/events_test_utils_x11.h
+++ b/ui/events/test/events_test_utils_x11.h
@@ -60,6 +60,8 @@ class ScopedXI2Event {
  private:
   void Cleanup();
 
+  void SetUpValuators(const std::vector<Valuator>& valuators);
+
   scoped_ptr<XEvent> event_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedXI2Event);
@@ -69,7 +71,7 @@ class ScopedXI2Event {
 void SetUpScrollDeviceForTest(unsigned int deviceid);
 
 // Initializes a list of touchscreen devices for touch events.
-void SetupTouchDevicesForTest(const std::vector<unsigned int>& devices);
+void SetUpTouchDevicesForTest(const std::vector<unsigned int>& devices);
 
 }  // namespace ui