Move all event related devices from ui/events/ to ui/events/devices/

ui/views/controls/menu/menu_controller_unittest.cc

 // Copyright 2014 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 "ui/views/controls/menu/menu_controller.h"
 
 #include "base/run_loop.h"
 #include "ui/aura/scoped_window_targeter.h"
 #include "ui/aura/window.h"
 #include "ui/events/event_targeter.h"
 #include "ui/events/platform/platform_event_source.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/wm/public/dispatcher_client.h"
 
 #if defined(OS_WIN)
 #include "base/message_loop/message_pump_dispatcher.h"
 #elif defined(USE_X11)
 #include <X11/Xlib.h>
 #undef Bool
 #undef None
+#include "ui/events/devices/x11/device_data_manager_x11.h"
 #include "ui/events/test/events_test_utils_x11.h"
-#include "ui/events/x/device_data_manager_x11.h"
 #elif defined(USE_OZONE)
 #include "ui/events/event.h"
 #endif
 
 namespace views {
 
 namespace {
 
 class TestMenuItemView : public MenuItemView {
  public:
@@ skipping 226 matching lines @@
         FROM_HERE,
         base::Bind(&MenuControllerTest::DispatchEscapeAndExpect,
                    base::Unretained(this),
                    MenuController::EXIT_NONE));
     RunMenu(owner.get());
   }
 }
 #endif
 
 }  // namespace views