Move automation/ui_controls to ui/ui_controls

chrome/test/base/ui_test_utils_aura.cc

Index: chrome/test/base/ui_test_utils_aura.cc
diff --git a/chrome/test/base/ui_test_utils_aura.cc b/chrome/test/base/ui_test_utils_aura.cc
index ff2c2144865c8dd81b71cc8fa8dd28b1a6f03c8b..c96cb989586a2498cb29629c7459df451bcdbe17 100644
--- a/chrome/test/base/ui_test_utils_aura.cc
+++ b/chrome/test/base/ui_test_utils_aura.cc
@@ -6,11 +6,11 @@
 
 #include "base/logging.h"
 #include "base/message_loop.h"
-#include "chrome/browser/automation/ui_controls.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "ui/aura/window.h"
+#include "ui/ui_controls/ui_controls.h"
 #include "ui/views/focus/focus_manager.h"
 
 namespace ui_test_utils {
@@ -35,7 +35,7 @@ void ClickOnView(const Browser* browser, ViewID vid) {
   views::View* view =
       reinterpret_cast<BrowserView*>(browser_window)->GetViewByID(vid);
   DCHECK(view);
-  ui_controls::MoveMouseToCenterAndPress(
+  MoveMouseToCenterAndPress(
       view,
       ui_controls::LEFT,
       ui_controls::DOWN | ui_controls::UP,
@@ -52,4 +52,16 @@ bool ShowAndFocusNativeWindow(gfx::NativeWindow window) {
   return true;
 }
 
+void MoveMouseToCenterAndPress(views::View* view,
+                               ui_controls::MouseButton button,
+                               int state,
+                               const base::Closure& closure) {
+  DCHECK(view);
+  DCHECK(view->GetWidget());
+  gfx::Point view_center(view->width() / 2, view->height() / 2);
+  views::View::ConvertPointToScreen(view, &view_center);
+  ui_controls::SendMouseMove(view_center.x(), view_center.y());
+  ui_controls::SendMouseEventsNotifyWhenDone(button, state, closure);
+}
+
 }  // namespace ui_test_utils