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

ui/aura/root_window_host_x11_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 "base/sys_info.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/root_window_host_x11.h"
 #include "ui/aura/test/aura_test_base.h"
@@ skipping 92 matching lines @@
 #endif  // defined(OS_CHROMEOS)
 
   scoped_ptr<RootWindowHostX11> root_window_host(
       new RootWindowHostX11(gfx::Rect(0, 0, 2560, 1700)));
   scoped_ptr<TestRootWindowHostDelegate> delegate(
       new TestRootWindowHostDelegate());
   root_window_host->set_delegate(delegate.get());
 
   std::vector<unsigned int> devices;
   devices.push_back(0);
-  ui::SetupTouchDevicesForTest(devices);
+  ui::SetUpTouchDevicesForTest(devices);
   std::vector<ui::Valuator> valuators;
 
   EXPECT_EQ(ui::ET_UNKNOWN, delegate->last_touch_type());
   EXPECT_EQ(-1, delegate->last_touch_id());
 
   ui::ScopedXI2Event scoped_xevent;
 #if defined(OS_CHROMEOS)
   // This touch is out of bounds.
   scoped_xevent.InitTouchEvent(
       0, XI_TouchBegin, 5, gfx::Point(1500, 2500), valuators);
@@ skipping 51 matching lines @@
 
   int host2_y_offset = 1700;
   scoped_ptr<RootWindowHostX11> root_window_host2(
       new RootWindowHostX11(gfx::Rect(0, host2_y_offset, 1920, 1080)));
   scoped_ptr<TestRootWindowHostDelegate> delegate2(
       new TestRootWindowHostDelegate());
   root_window_host2->set_delegate(delegate2.get());
 
   std::vector<unsigned int> devices;
   devices.push_back(0);
-  ui::SetupTouchDevicesForTest(devices);
+  ui::SetUpTouchDevicesForTest(devices);
   std::vector<ui::Valuator> valuators;
 
   EXPECT_EQ(ui::ET_UNKNOWN, delegate1->last_touch_type());
   EXPECT_EQ(-1, delegate1->last_touch_id());
   EXPECT_EQ(ui::ET_UNKNOWN, delegate2->last_touch_type());
   EXPECT_EQ(-1, delegate2->last_touch_id());
 
   // 2 Touch events are targeted at the second RootWindowHost.
   ui::ScopedXI2Event scoped_xevent;
   scoped_xevent.InitTouchEvent(
@@ skipping 70 matching lines @@
 
   // Revert the CrOS testing env otherwise the following non-CrOS aura
   // tests will fail.
   // Fake a ChromeOS running env.
   kLsbRelease = "";
   base::SysInfo::SetChromeOSVersionInfoForTest(kLsbRelease, base::Time());
 }
 #endif  // defined(OS_CHROMEOS)
 
 }  // namespace aura