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

ui/events/test/events_test_utils_x11.h

 // 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.
 
 #ifndef UI_EVENTS_TEST_EVENTS_TEST_UTILS_X11_H_
 #define UI_EVENTS_TEST_EVENTS_TEST_UTILS_X11_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/keycodes/keyboard_codes.h"
@@ skipping 42 matching lines @@
 
   void InitTouchEvent(int deviceid,
                       int evtype,
                       int tracking_id,
                       const gfx::Point& location,
                       const std::vector<Valuator>& valuators);
 
  private:
   void Cleanup();
 
+  void SetUpValuators(const std::vector<Valuator>& valuators);
+
   scoped_ptr<XEvent> event_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedXI2Event);
 };
 
 // Initializes a test touchpad device for scroll events.
 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
 
 #endif  // UI_EVENTS_TEST_EVENTS_TEST_UTILS_X11_H_