events: Move some files into ui/base/events/

ash/wm/user_activity_detector_unittest.cc

 // Copyright (c) 2012 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/user_activity_detector.h"
 
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/user_activity_observer.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
-#include "ui/base/event.h"
-#include "ui/base/events.h"
+#include "ui/base/events/event.h"
+#include "ui/base/events/event_constants.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/gfx/point.h"
 
 namespace ash {
 namespace test {
 
 // Implementation that just counts the number of times we've been told that the
 // user is active.
 class TestUserActivityObserver : public UserActivityObserver {
  public:
@@ skipping 125 matching lines @@
   scoped_ptr<aura::Window> window(
       aura::test::CreateTestWindowWithId(12345, NULL));
   ui::MouseEvent mouse_event(
       ui::ET_MOUSE_MOVED, gfx::Point(), gfx::Point(), ui::EF_IS_SYNTHESIZED);
   EXPECT_FALSE(detector_->PreHandleMouseEvent(window.get(), &mouse_event));
   EXPECT_EQ(0, observer_->num_invocations());
 }
 
 }  // namespace test
 }  // namespace ash