Move sticky keys files to their own directory and rename to StickyKeysController.

ash/sticky_keys/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 "ash/sticky_keys/sticky_keys_controller.h"
 
 #include <X11/Xlib.h>
 #undef None
 #undef Bool
 #undef RootWindow
 
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 736 matching lines @@
   EXPECT_EQ(StickyKeysHandler::DISABLED, sticky_key.current_state());
 }
 
 TEST_F(StickyKeysTest, KeyEventDispatchImpl) {
   // Test the actual key event dispatch implementation.
   EventBuffer buffer;
   ScopedVector<ui::Event> events;
   aura::RootWindowHostDelegate* delegate = Shell::GetPrimaryRootWindow()
       ->GetDispatcher()->AsRootWindowHostDelegate();
   Shell::GetInstance()->AddPreTargetHandler(&buffer);
-  Shell::GetInstance()->sticky_keys()->Enable(true);
+  Shell::GetInstance()->sticky_keys_controller()->Enable(true);
 
   SendActivateStickyKeyPattern(delegate, ui::VKEY_CONTROL);
   scoped_ptr<ui::KeyEvent> ev;
   buffer.PopEvents(&events);
 
   // Test key press event is correctly modified and modifier release
   // event is sent.
   ev.reset(GenerateKey(true, ui::VKEY_C));
   delegate->OnHostKeyEvent(ev.get());
   buffer.PopEvents(&events);
@@ skipping 18 matching lines @@
   Shell::GetInstance()->RemovePreTargetHandler(&buffer);
 }
 
 TEST_F(StickyKeysTest, MouseEventDispatchImpl) {
   // Test the actual sticky mouse event dispatch implementation.
   EventBuffer buffer;
   ScopedVector<ui::Event> events;
   aura::RootWindowHostDelegate* delegate = Shell::GetPrimaryRootWindow()
       ->GetDispatcher()->AsRootWindowHostDelegate();
   Shell::GetInstance()->AddPreTargetHandler(&buffer);
-  Shell::GetInstance()->sticky_keys()->Enable(true);
+  Shell::GetInstance()->sticky_keys_controller()->Enable(true);
 
   scoped_ptr<ui::MouseEvent> ev;
   SendActivateStickyKeyPattern(delegate, ui::VKEY_CONTROL);
   buffer.PopEvents(&events);
 
   // Test mouse press event is correctly modified.
   ev.reset(GenerateMouseEvent(true));
   delegate->OnHostMouseEvent(ev.get());
   buffer.PopEvents(&events);
   EXPECT_EQ(1u, events.size());
@@ skipping 15 matching lines @@
   Shell::GetInstance()->RemovePreTargetHandler(&buffer);
 }
 
 TEST_F(StickyKeysTest, MouseWheelEventDispatchImpl) {
   // Test the actual mouse wheel event dispatch implementation.
   EventBuffer buffer;
   ScopedVector<ui::Event> events;
   aura::RootWindowHostDelegate* delegate = Shell::GetPrimaryRootWindow()
       ->GetDispatcher()->AsRootWindowHostDelegate();
   Shell::GetInstance()->AddPreTargetHandler(&buffer);
-  Shell::GetInstance()->sticky_keys()->Enable(true);
+  Shell::GetInstance()->sticky_keys_controller()->Enable(true);
 
   scoped_ptr<ui::MouseWheelEvent> ev;
   SendActivateStickyKeyPattern(delegate, ui::VKEY_CONTROL);
   buffer.PopEvents(&events);
 
   // Test positive mouse wheel event is correctly modified and modifier release
   // event is sent.
   ev.reset(GenerateMouseWheelEvent(ui::MouseWheelEvent::kWheelDelta));
   delegate->OnHostMouseEvent(ev.get());
   buffer.PopEvents(&events);
@@ skipping 20 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