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

ash/wm/sticky_keys_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 "ash/wm/sticky_keys.h"
 
 #include <X11/Xlib.h>
 #undef None
 #undef Bool
 #undef RootWindow
@@ skipping 484 matching lines @@
   sticky_key.HandleKeyEvent(kev.get());
   EXPECT_TRUE(kev->flags() & ui::EF_CONTROL_DOWN);
   kev.reset(GenerateKey(false, ui::VKEY_N));
   sticky_key.HandleKeyEvent(kev.get());
   EXPECT_TRUE(kev->flags() & ui::EF_CONTROL_DOWN);
 
   EXPECT_EQ(StickyKeysHandler::LOCKED, sticky_key.current_state());
 }
 
 TEST_F(StickyKeysTest, ScrollEvents) {
-  ui::SetUpScrollDeviceForTest(kScrollDeviceId);
+  ui::SetupScrollDeviceForTest(kScrollDeviceId);

[Daniel Erat, 2013/12/02 21:29:10]

"SetUp" was correct. see e.g. http://notaverb.com/setup

[sadrul, 2013/12/02 21:49:50]

Done.

   // Australlian scrolling is enabled by default for some reason.
   ui::DeviceDataManager::GetInstance()->set_natural_scroll_enabled(true);
 
   scoped_ptr<ui::ScrollEvent> ev;
   scoped_ptr<ui::KeyEvent> kev;
   MockStickyKeysHandlerDelegate* mock_delegate =
       new MockStickyKeysHandlerDelegate(this);
   StickyKeysHandler sticky_key(ui::EF_CONTROL_DOWN, mock_delegate);
 
   int scroll_deltas[] = {-10, 10};
@@ skipping 220 matching lines @@
             static_cast<ui::MouseWheelEvent*>(events[0])->y_offset());
   EXPECT_TRUE(events[0]->flags() & ui::EF_CONTROL_DOWN);
   EXPECT_EQ(ui::ET_KEY_RELEASED, events[1]->type());
   EXPECT_EQ(ui::VKEY_CONTROL,
             static_cast<ui::KeyEvent*>(events[1])->key_code());
 
   Shell::GetInstance()->RemovePreTargetHandler(&buffer);
 }
 
 }  // namespace ash