Move automation/ui_controls to ui/ui_controls

chrome/browser/ui/views/button_dropdown_test.cc

Index: chrome/browser/ui/views/button_dropdown_test.cc
diff --git a/chrome/browser/ui/views/button_dropdown_test.cc b/chrome/browser/ui/views/button_dropdown_test.cc
index 7d1642ff743176b79c057560b097526f3bf8ef8f..2fad70c1bb07f2253b5574edf978df01f2563051 100644
--- a/chrome/browser/ui/views/button_dropdown_test.cc
+++ b/chrome/browser/ui/views/button_dropdown_test.cc
@@ -4,9 +4,10 @@
 
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/automation/ui_controls.h"
 #include "chrome/test/base/view_event_test_base.h"
+#include "chrome/test/base/ui_test_utils.h"
 #include "ui/base/models/simple_menu_model.h"
+#include "ui/ui_controls/ui_controls.h"
 #include "ui/views/controls/button/button_dropdown.h"
 
 class ButtonDropDownDragTest : public ViewEventTestBase,
@@ -70,7 +71,7 @@ class ButtonDropDownDragTest : public ViewEventTestBase,
   // ViewEventTestBase implementation.
   virtual void DoTestOnMessageLoop() OVERRIDE {
     // Click on the ButtonDropDown.
-    ui_controls::MoveMouseToCenterAndPress(
+    ui_test_utils::MoveMouseToCenterAndPress(
         button_,
         ui_controls::LEFT,
         ui_controls::DOWN,
@@ -101,7 +102,7 @@ class ButtonDropDownDragTest : public ViewEventTestBase,
   void Step3() {
     // Click mouse to dismiss menu.  The views menu does not dismiss the
     // menu on click-drag-release unless an item is selected.
-    ui_controls::MoveMouseToCenterAndPress(
+    ui_test_utils::MoveMouseToCenterAndPress(
         button_,
         ui_controls::LEFT,
         ui_controls::DOWN | ui_controls::UP,