Original CL (http://codereview.chromium.org/9390038/) somehow got screwed and CQ couldn't patch it. This is exact copy of the original CL to land.

* Move automation/ui_controls to ui/ui_controls 
* Refactored aura impl so that ui/ui_controls doesn't depend on 
aura. 
* Moved MoveMouseToCenterAndPress to ui_test_util.h as it depends on views and can't be declared in ui. 
* a couple of cleanups: 
- Renamed gtk_screen_utils.h to _util.h to match other util.h files. 
- indent fix 
- remove unnecessary includes. 

This CL allows a test to use ui_controls without depending on chrome. 

TBR=sky@chromium.org,erg@chromium.org
BUG=none 
TEST=none

Review URL: http://codereview.chromium.org/9699098

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127138 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 61 insertions, 53 deletions

diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
index cc7a60f..fea3fd8 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
@@ -8,7 +8,6 @@
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
-#include "chrome/browser/automation/ui_controls.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ -28,6 +27,7 @@
 #include "ui/base/accessibility/accessibility_types.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/ui_controls/ui_controls.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/button/text_button.h"
 #include "ui/views/controls/menu/menu_controller.h"
@@ -303,7 +303,7 @@ class BookmarkBarViewTest1 : public BookmarkBarViewEventTestBase {
     // Move the mouse to the first folder on the bookmark bar and press the
     // mouse.
     views::TextButton* button = GetBookmarkButton(0);
-    ui_controls::MoveMouseToCenterAndPress(button, ui_controls::LEFT,
+    ui_test_utils::MoveMouseToCenterAndPress(button, ui_controls::LEFT,
         ui_controls::DOWN | ui_controls::UP,
         CreateEventTask(this, &BookmarkBarViewTest1::Step2));
   }
@@ -324,7 +324,7 @@ class BookmarkBarViewTest1 : public BookmarkBarViewEventTestBase {
 
     views::MenuItemView* menu_to_select =
         menu->GetSubmenu()->GetMenuItemAt(0);
-    ui_controls::MoveMouseToCenterAndPress(menu_to_select, ui_controls::LEFT,
+    ui_test_utils::MoveMouseToCenterAndPress(menu_to_select, ui_controls::LEFT,
         ui_controls::DOWN | ui_controls::UP,
         CreateEventTask(this, &BookmarkBarViewTest1::Step3));
   }
@@ -356,7 +356,7 @@ class BookmarkBarViewTest2 : public BookmarkBarViewEventTestBase {
     // Move the mouse to the first folder on the bookmark bar and press the
     // mouse.
     views::TextButton* button = GetBookmarkButton(0);
-    ui_controls::MoveMouseToCenterAndPress(button, ui_controls::LEFT,
+    ui_test_utils::MoveMouseToCenterAndPress(button, ui_controls::LEFT,
         ui_controls::DOWN | ui_controls::UP,
         CreateEventTask(this, &BookmarkBarViewTest2::Step2));
   }
@@ -406,7 +406,7 @@ class BookmarkBarViewTest3 : public BookmarkBarViewEventTestBase {
     // Move the mouse to the first folder on the bookmark bar and press the
     // mouse.
     views::MenuButton* button = bb_view_->other_bookmarked_button();
-    ui_controls::MoveMouseToCenterAndPress(button, ui_controls::LEFT,
+    ui_test_utils::MoveMouseToCenterAndPress(button, ui_controls::LEFT,
         ui_controls::DOWN | ui_controls::UP,
         CreateEventTask(this, &BookmarkBarViewTest3::Step2));
   }
@@ -423,7 +423,7 @@ class BookmarkBarViewTest3 : public BookmarkBarViewEventTestBase {
     ASSERT_TRUE(child_menu != NULL);
 
     // Click on second child, which has a submenu.
-    ui_controls::MoveMouseToCenterAndPress(child_menu, ui_controls::LEFT,
+    ui_test_utils::MoveMouseToCenterAndPress(child_menu, ui_controls::LEFT,
         ui_controls::DOWN | ui_controls::UP,
         CreateEventTask(this, &BookmarkBarViewTest3::Step3));
   }
@@ -440,7 +440,7 @@ class BookmarkBarViewTest3 : public BookmarkBarViewEventTestBase {
     // Click on third child, which has a submenu too.
     child_menu = menu->GetSubmenu()->GetMenuItemAt(2);
     ASSERT_TRUE(child_menu != NULL);
-    ui_controls::MoveMouseToCenterAndPress(child_menu, ui_controls::LEFT,
+    ui_test_utils::MoveMouseToCenterAndPress(child_menu, ui_controls::LEFT,
         ui_controls::DOWN | ui_controls::UP,
         CreateEventTask(this, &BookmarkBarViewTest3::Step4));
   }
@@ -513,7 +513,7 @@ class BookmarkBarViewTest4 : public BookmarkBarViewEventTestBase {
     // Move the mouse to the first folder on the bookmark bar and press the
     // mouse.
     views::TextButton* button = bb_view_->other_bookmarked_button();
-    ui_controls::MoveMouseToCenterAndPress(button, ui_controls::LEFT,
+    ui_test_utils::MoveMouseToCenterAndPress(button, ui_controls::LEFT,
         ui_controls::DOWN | ui_controls::UP,
         CreateEventTask(this, &BookmarkBarViewTest4::Step2));
   }
@@ -530,7 +530,7 @@ class BookmarkBarViewTest4 : public BookmarkBarViewEventTestBase {
     ASSERT_TRUE(child_menu != NULL);
 
     // Right click on the first child to get its context menu.
-    ui_controls::MoveMouseToCenterAndPress(child_menu, ui_controls::RIGHT,
+    ui_test_utils::MoveMouseToCenterAndPress(child_menu, ui_controls::RIGHT,
         ui_controls::DOWN | ui_controls::UP, base::Closure());
     // Step3 will be invoked by ContextMenuNotificationObserver.
   }
@@ -543,7 +543,8 @@ class BookmarkBarViewTest4 : public BookmarkBarViewEventTestBase {
     ASSERT_TRUE(menu->GetSubmenu()->IsShowing());
 
     // Select the first menu item (open).
-    ui_controls::MoveMouseToCenterAndPress(menu->GetSubmenu()->GetMenuItemAt(0),
+    ui_test_utils::MoveMouseToCenterAndPress(
+        menu->GetSubmenu()->GetMenuItemAt(0),
         ui_controls::LEFT, ui_controls::DOWN | ui_controls::UP,
         CreateEventTask(this, &BookmarkBarViewTest4::Step4));
   }
@@ -568,7 +569,7 @@ class BookmarkBarViewTest5 : public BookmarkBarViewEventTestBase {
     // Move the mouse to the first folder on the bookmark bar and press the
     // mouse.
     views::TextButton* button = GetBookmarkButton(0);
-    ui_controls::MoveMouseToCenterAndPress(button, ui_controls::LEFT,
+    ui_test_utils::MoveMouseToCenterAndPress(button, ui_controls::LEFT,
         ui_controls::DOWN | ui_controls::UP,
         CreateEventTask(this, &BookmarkBarViewTest5::Step2));
   }
@@ -585,7 +586,7 @@ class BookmarkBarViewTest5 : public BookmarkBarViewEventTestBase {
     ASSERT_TRUE(child_menu != NULL);
 
     // Move mouse to center of menu and press button.
-    ui_controls::MoveMouseToCenterAndPress(child_menu, ui_controls::LEFT,
+    ui_test_utils::MoveMouseToCenterAndPress(child_menu, ui_controls::LEFT,
         ui_controls::DOWN,
         CreateEventTask(this, &BookmarkBarViewTest5::Step3));
   }
@@ -635,7 +636,7 @@ class BookmarkBarViewTest6 : public BookmarkBarViewEventTestBase {
   virtual void DoTestOnMessageLoop() {
     // Press the mouse button on the overflow button. Don't release it though.
     views::TextButton* button = bb_view_->overflow_button();
-    ui_controls::MoveMouseToCenterAndPress(button, ui_controls::LEFT,
+    ui_test_utils::MoveMouseToCenterAndPress(button, ui_controls::LEFT,
         ui_controls::DOWN, CreateEventTask(this, &BookmarkBarViewTest6::Step2));
   }
 
@@ -651,7 +652,7 @@ class BookmarkBarViewTest6 : public BookmarkBarViewEventTestBase {
     ASSERT_TRUE(child_menu != NULL);
 
     // Move mouse to center of menu and release mouse.
-    ui_controls::MoveMouseToCenterAndPress(child_menu, ui_controls::LEFT,
+    ui_test_utils::MoveMouseToCenterAndPress(child_menu, ui_controls::LEFT,
         ui_controls::UP, CreateEventTask(this, &BookmarkBarViewTest6::Step3));
   }
 
@@ -676,7 +677,7 @@ class BookmarkBarViewTest7 : public BookmarkBarViewEventTestBase {
     // Move the mouse to the first folder on the bookmark bar and press the
     // mouse.
     views::TextButton* button = GetBookmarkButton(0);
-    ui_controls::MoveMouseToCenterAndPress(button, ui_controls::LEFT,
+    ui_test_utils::MoveMouseToCenterAndPress(button, ui_controls::LEFT,
         ui_controls::DOWN | ui_controls::UP,
         CreateEventTask(this, &BookmarkBarViewTest7::Step2));
   }
@@ -693,7 +694,7 @@ class BookmarkBarViewTest7 : public BookmarkBarViewEventTestBase {
     ASSERT_TRUE(child_menu != NULL);
 
     // Move mouse to center of menu and press button.
-    ui_controls::MoveMouseToCenterAndPress(child_menu, ui_controls::LEFT,
+    ui_test_utils::MoveMouseToCenterAndPress(child_menu, ui_controls::LEFT,
         ui_controls::DOWN,
         CreateEventTask(this, &BookmarkBarViewTest7::Step3));
   }
@@ -749,7 +750,7 @@ class BookmarkBarViewTest8 : public BookmarkBarViewEventTestBase {
     // Move the mouse to the first folder on the bookmark bar and press the
     // mouse.
     views::TextButton* button = GetBookmarkButton(0);
-    ui_controls::MoveMouseToCenterAndPress(button, ui_controls::LEFT,
+    ui_test_utils::MoveMouseToCenterAndPress(button, ui_controls::LEFT,
         ui_controls::DOWN | ui_controls::UP,
         CreateEventTask(this, &BookmarkBarViewTest8::Step2));
   }
@@ -766,7 +767,7 @@ class BookmarkBarViewTest8 : public BookmarkBarViewEventTestBase {
     ASSERT_TRUE(child_menu != NULL);
 
     // Move mouse to center of menu and press button.
-    ui_controls::MoveMouseToCenterAndPress(child_menu, ui_controls::LEFT,
+    ui_test_utils::MoveMouseToCenterAndPress(child_menu, ui_controls::LEFT,
         ui_controls::DOWN,
         CreateEventTask(this, &BookmarkBarViewTest8::Step3));
   }
@@ -807,7 +808,7 @@ class BookmarkBarViewTest8 : public BookmarkBarViewEventTestBase {
 
     views::MenuItemView* target_menu =
         drop_menu->GetSubmenu()->GetMenuItemAt(1);
-    ui_controls::MoveMouseToCenterAndPress(
+    ui_test_utils::MoveMouseToCenterAndPress(
         target_menu, ui_controls::LEFT, ui_controls::UP,
         CreateEventTask(this, &BookmarkBarViewTest8::Step6));
   }
@@ -834,7 +835,7 @@ class BookmarkBarViewTest9 : public BookmarkBarViewEventTestBase {
     // Move the mouse to the first folder on the bookmark bar and press the
     // mouse.
     views::TextButton* button = GetBookmarkButton(0);
-    ui_controls::MoveMouseToCenterAndPress(button, ui_controls::LEFT,
+    ui_test_utils::MoveMouseToCenterAndPress(button, ui_controls::LEFT,
         ui_controls::DOWN | ui_controls::UP,
         CreateEventTask(this, &BookmarkBarViewTest9::Step2));
   }
@@ -902,7 +903,7 @@ class BookmarkBarViewTest10 : public BookmarkBarViewEventTestBase {
     // Move the mouse to the first folder on the bookmark bar and press the
     // mouse.
     views::TextButton* button = GetBookmarkButton(0);
-    ui_controls::MoveMouseToCenterAndPress(button, ui_controls::LEFT,
+    ui_test_utils::MoveMouseToCenterAndPress(button, ui_controls::LEFT,
         ui_controls::DOWN | ui_controls::UP,
         CreateEventTask(this, &BookmarkBarViewTest10::Step2));
     MessageLoop::current()->RunAllPending();
@@ -1017,7 +1018,7 @@ class BookmarkBarViewTest11 : public BookmarkBarViewEventTestBase {
     // Move the mouse to the first folder on the bookmark bar and press the
     // mouse.
     views::TextButton* button = bb_view_->other_bookmarked_button();
-    ui_controls::MoveMouseToCenterAndPress(button, ui_controls::LEFT,
+    ui_test_utils::MoveMouseToCenterAndPress(button, ui_controls::LEFT,
         ui_controls::DOWN | ui_controls::UP,
         CreateEventTask(this, &BookmarkBarViewTest11::Step2));
   }
@@ -1034,7 +1035,7 @@ class BookmarkBarViewTest11 : public BookmarkBarViewEventTestBase {
     ASSERT_TRUE(child_menu != NULL);
 
     // Right click on the first child to get its context menu.
-    ui_controls::MoveMouseToCenterAndPress(child_menu, ui_controls::RIGHT,
+    ui_test_utils::MoveMouseToCenterAndPress(child_menu, ui_controls::RIGHT,
         ui_controls::DOWN | ui_controls::UP, base::Closure());
     // Step3 will be invoked by ContextMenuNotificationObserver.
   }
@@ -1084,7 +1085,7 @@ class BookmarkBarViewTest12 : public BookmarkBarViewEventTestBase {
   virtual void DoTestOnMessageLoop() {
     // Open up the other folder.
     views::TextButton* button = bb_view_->other_bookmarked_button();
-    ui_controls::MoveMouseToCenterAndPress(button, ui_controls::LEFT,
+    ui_test_utils::MoveMouseToCenterAndPress(button, ui_controls::LEFT,
         ui_controls::DOWN | ui_controls::UP,
         CreateEventTask(this, &BookmarkBarViewTest12::Step2));
     bookmark_utils::num_urls_before_prompting = 1;
@@ -1106,7 +1107,7 @@ class BookmarkBarViewTest12 : public BookmarkBarViewEventTestBase {
     ASSERT_TRUE(child_menu != NULL);
 
     // Right click on the second child (a folder) to get its context menu.
-    ui_controls::MoveMouseToCenterAndPress(child_menu, ui_controls::RIGHT,
+    ui_test_utils::MoveMouseToCenterAndPress(child_menu, ui_controls::RIGHT,
         ui_controls::DOWN | ui_controls::UP,
         CreateEventTask(this, &BookmarkBarViewTest12::Step3));
   }
@@ -1120,7 +1121,7 @@ class BookmarkBarViewTest12 : public BookmarkBarViewEventTestBase {
     views::MenuItemView* child_menu =
         menu->GetSubmenu()->GetMenuItemAt(0);
     ASSERT_TRUE(child_menu != NULL);
-    ui_controls::MoveMouseToCenterAndPress(child_menu, ui_controls::LEFT,
+    ui_test_utils::MoveMouseToCenterAndPress(child_menu, ui_controls::LEFT,
         ui_controls::DOWN | ui_controls::UP, base::Closure());
 
     // Delay until we send tab, otherwise the message box doesn't appear
@@ -1172,7 +1173,7 @@ class BookmarkBarViewTest13 : public BookmarkBarViewEventTestBase {
     // Move the mouse to the first folder on the bookmark bar and press the
     // mouse.
     views::TextButton* button = bb_view_->other_bookmarked_button();
-    ui_controls::MoveMouseToCenterAndPress(button, ui_controls::LEFT,
+    ui_test_utils::MoveMouseToCenterAndPress(button, ui_controls::LEFT,
         ui_controls::DOWN | ui_controls::UP,
         CreateEventTask(this, &BookmarkBarViewTest13::Step2));
   }
@@ -1189,7 +1190,7 @@ class BookmarkBarViewTest13 : public BookmarkBarViewEventTestBase {
     ASSERT_TRUE(child_menu != NULL);
 
     // Right click on the first child to get its context menu.
-    ui_controls::MoveMouseToCenterAndPress(child_menu, ui_controls::RIGHT,
+    ui_test_utils::MoveMouseToCenterAndPress(child_menu, ui_controls::RIGHT,
         ui_controls::DOWN | ui_controls::UP, base::Closure());
     // Step3 will be invoked by ContextMenuNotificationObserver.
   }
@@ -1214,7 +1215,7 @@ class BookmarkBarViewTest13 : public BookmarkBarViewEventTestBase {
 
     // Click on the separator. Clicking on the separator shouldn't visually
     // change anything.
-    ui_controls::MoveMouseToCenterAndPress(separator_view,
+    ui_test_utils::MoveMouseToCenterAndPress(separator_view,
         ui_controls::LEFT, ui_controls::DOWN | ui_controls::UP,
         CreateEventTask(this, &BookmarkBarViewTest13::Step4));
   }
@@ -1227,8 +1228,10 @@ class BookmarkBarViewTest13 : public BookmarkBarViewEventTestBase {
     ASSERT_TRUE(menu->GetSubmenu()->IsShowing());
 
     // Select the first context menu item.
-    ui_controls::MoveMouseToCenterAndPress(menu->GetSubmenu()->GetMenuItemAt(0),
-        ui_controls::LEFT, ui_controls::DOWN | ui_controls::UP,
+    ui_test_utils::MoveMouseToCenterAndPress(
+        menu->GetSubmenu()->GetMenuItemAt(0),
+        ui_controls::LEFT,
+        ui_controls::DOWN | ui_controls::UP,
         CreateEventTask(this, &BookmarkBarViewTest13::Step5));
   }
 
@@ -1255,7 +1258,7 @@ class BookmarkBarViewTest14 : public BookmarkBarViewEventTestBase {
     // Move the mouse to the first folder on the bookmark bar and press the
     // right mouse button.
     views::TextButton* button = GetBookmarkButton(0);
-    ui_controls::MoveMouseToCenterAndPress(button, ui_controls::RIGHT,
+    ui_test_utils::MoveMouseToCenterAndPress(button, ui_controls::RIGHT,
         ui_controls::DOWN | ui_controls::UP, base::Closure());
     // Step2 will be invoked by ContextMenuNotificationObserver.
   }
@@ -1295,7 +1298,7 @@ class BookmarkBarViewTest15 : public BookmarkBarViewEventTestBase {
   virtual void DoTestOnMessageLoop() {
     // Show the other bookmarks.
     views::TextButton* button = bb_view_->other_bookmarked_button();
-    ui_controls::MoveMouseToCenterAndPress(button, ui_controls::LEFT,
+    ui_test_utils::MoveMouseToCenterAndPress(button, ui_controls::LEFT,
         ui_controls::DOWN | ui_controls::UP,
         CreateEventTask(this, &BookmarkBarViewTest15::Step2));
   }
@@ -1314,7 +1317,7 @@ class BookmarkBarViewTest15 : public BookmarkBarViewEventTestBase {
     deleted_menu_id_ = child_menu->GetCommand();
 
     // Right click on the second child to get its context menu.
-    ui_controls::MoveMouseToCenterAndPress(child_menu, ui_controls::RIGHT,
+    ui_test_utils::MoveMouseToCenterAndPress(child_menu, ui_controls::RIGHT,
         ui_controls::DOWN | ui_controls::UP, base::Closure());
     // Step3 will be invoked by ContextMenuNotificationObserver.
   }
@@ -1331,7 +1334,7 @@ class BookmarkBarViewTest15 : public BookmarkBarViewEventTestBase {
     ASSERT_TRUE(delete_menu);
 
     // Click on the delete button.
-    ui_controls::MoveMouseToCenterAndPress(delete_menu,
+    ui_test_utils::MoveMouseToCenterAndPress(delete_menu,
         ui_controls::LEFT, ui_controls::DOWN | ui_controls::UP,
         CreateEventTask(this, &BookmarkBarViewTest15::Step4));
   }
@@ -1369,7 +1372,7 @@ class BookmarkBarViewTest16 : public BookmarkBarViewEventTestBase {
     // Move the mouse to the first folder on the bookmark bar and press the
     // mouse.
     views::TextButton* button = GetBookmarkButton(0);
-    ui_controls::MoveMouseToCenterAndPress(button, ui_controls::LEFT,
+    ui_test_utils::MoveMouseToCenterAndPress(button, ui_controls::LEFT,
         ui_controls::DOWN | ui_controls::UP,
         CreateEventTask(this, &BookmarkBarViewTest16::Step2));
   }
@@ -1408,7 +1411,7 @@ class BookmarkBarViewTest17 : public BookmarkBarViewEventTestBase {
     // Move the mouse to the other folder on the bookmark bar and press the
     // left mouse button.
     views::TextButton* button = bb_view_->other_bookmarked_button();
-    ui_controls::MoveMouseToCenterAndPress(button, ui_controls::LEFT,
+    ui_test_utils::MoveMouseToCenterAndPress(button, ui_controls::LEFT,
         ui_controls::DOWN | ui_controls::UP,
         CreateEventTask(this, &BookmarkBarViewTest17::Step2));
   }
@@ -1423,7 +1426,7 @@ class BookmarkBarViewTest17 : public BookmarkBarViewEventTestBase {
     // Right click on the second item to show its context menu.
     views::MenuItemView* child_menu = menu->GetSubmenu()->GetMenuItemAt(2);
     ASSERT_TRUE(child_menu != NULL);
-    ui_controls::MoveMouseToCenterAndPress(child_menu, ui_controls::RIGHT,
+    ui_test_utils::MoveMouseToCenterAndPress(child_menu, ui_controls::RIGHT,
         ui_controls::DOWN | ui_controls::UP, base::Closure());
     // Step3 will be invoked by ContextMenuNotificationObserver.
   }
@@ -1443,7 +1446,7 @@ class BookmarkBarViewTest17 : public BookmarkBarViewEventTestBase {
     ASSERT_TRUE(child_menu != NULL);
 
     observer_.set_task(CreateEventTask(this, &BookmarkBarViewTest17::Step4));
-    ui_controls::MoveMouseToCenterAndPress(child_menu, ui_controls::RIGHT,
+    ui_test_utils::MoveMouseToCenterAndPress(child_menu, ui_controls::RIGHT,
         ui_controls::DOWN | ui_controls::UP, base::Closure());
     // Step4 will be invoked by ContextMenuNotificationObserver.
   }
@@ -1484,7 +1487,7 @@ class BookmarkBarViewTest18 : public BookmarkBarViewEventTestBase {
     // Move the mouse to the other folder on the bookmark bar and press the
     // left mouse button.
     views::TextButton* button = bb_view_->other_bookmarked_button();
-    ui_controls::MoveMouseToCenterAndPress(button, ui_controls::LEFT,
+    ui_test_utils::MoveMouseToCenterAndPress(button, ui_controls::LEFT,
         ui_controls::DOWN | ui_controls::UP,
         CreateEventTask(this, &BookmarkBarViewTest18::Step2));
   }
@@ -1527,7 +1530,7 @@ class BookmarkBarViewTest19 : public BookmarkBarViewEventTestBase {
     // Move the mouse to the other folder on the bookmark bar and press the
     // left mouse button.
     views::TextButton* button = bb_view_->other_bookmarked_button();
-    ui_controls::MoveMouseToCenterAndPress(button, ui_controls::LEFT,
+    ui_test_utils::MoveMouseToCenterAndPress(button, ui_controls::LEFT,
         ui_controls::DOWN | ui_controls::UP,
         CreateEventTask(this, &BookmarkBarViewTest19::Step2));
   }
@@ -1542,7 +1545,7 @@ class BookmarkBarViewTest19 : public BookmarkBarViewEventTestBase {
     // Click on the first folder.
     views::MenuItemView* child_menu = menu->GetSubmenu()->GetMenuItemAt(1);
     ASSERT_TRUE(child_menu != NULL);
-    ui_controls::MoveMouseToCenterAndPress(
+    ui_test_utils::MoveMouseToCenterAndPress(
         child_menu, ui_controls::LEFT,
         ui_controls::DOWN | ui_controls::UP,
         CreateEventTask(this, &BookmarkBarViewTest19::Step3));
@@ -1572,7 +1575,9 @@ class BookmarkBarViewTest19 : public BookmarkBarViewEventTestBase {
     // Click on the first folder.
     views::MenuItemView* child_menu = menu->GetSubmenu()->GetMenuItemAt(1);
     ASSERT_TRUE(child_menu != NULL);
-    ui_controls::MoveMouseToCenterAndPress(child_menu, ui_controls::LEFT,
+    ui_test_utils::MoveMouseToCenterAndPress(
+        child_menu,
+        ui_controls::LEFT,
         ui_controls::DOWN | ui_controls::UP,
         CreateEventTask(this, &BookmarkBarViewTest19::Step5));
   }
diff --git a/chrome/browser/ui/views/button_dropdown_test.cc b/chrome/browser/ui/views/button_dropdown_test.cc
index 7d1642f..77cd2ae 100644
--- a/chrome/browser/ui/views/button_dropdown_test.cc
+++ b/chrome/browser/ui/views/button_dropdown_test.cc
@@ -1,12 +1,13 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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 "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,
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index f81f4a7..5b6c5c7 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -20,7 +20,6 @@
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_view.h"
-#include "chrome/browser/automation/ui_controls.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/debugger/devtools_window.h"
@@ -93,6 +92,7 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
+#include "ui/ui_controls/ui_controls.h"
 #include "ui/views/controls/single_split_view.h"
 #include "ui/views/events/event.h"
 #include "ui/views/focus/external_focus_tracker.h"
diff --git a/chrome/browser/ui/views/menu_item_view_test.cc b/chrome/browser/ui/views/menu_item_view_test.cc
index 8f60856..cc75dd9 100644
--- a/chrome/browser/ui/views/menu_item_view_test.cc
+++ b/chrome/browser/ui/views/menu_item_view_test.cc
@@ -4,8 +4,9 @@
 
 #include "base/callback.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/ui_controls/ui_controls.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/button/menu_button_listener.h"
 #include "ui/views/controls/menu/menu_controller.h"
@@ -85,7 +86,7 @@ class MenuItemViewTestBase : public ViewEventTestBase,
  protected:
   // Generate a mouse click on the specified view and post a new task.
   virtual void Click(views::View* view, const base::Closure& next) {
-    ui_controls::MoveMouseToCenterAndPress(
+    ui_test_utils::MoveMouseToCenterAndPress(
         view,
         ui_controls::LEFT,
         ui_controls::DOWN | ui_controls::UP,
diff --git a/chrome/browser/ui/views/menu_model_adapter_test.cc b/chrome/browser/ui/views/menu_model_adapter_test.cc
index 3d78504..d98966a 100644
--- a/chrome/browser/ui/views/menu_model_adapter_test.cc
+++ b/chrome/browser/ui/views/menu_model_adapter_test.cc
@@ -4,9 +4,10 @@
 
 #include "base/callback.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/menu_model.h"
+#include "ui/ui_controls/ui_controls.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/button/menu_button_listener.h"
 #include "ui/views/controls/menu/menu_controller.h"
@@ -358,7 +359,7 @@ class MenuModelAdapterTest : public ViewEventTestBase,
  private:
   // Generate a mouse click on the specified view and post a new task.
   virtual void Click(views::View* view, const base::Closure& next) {
-    ui_controls::MoveMouseToCenterAndPress(
+    ui_test_utils::MoveMouseToCenterAndPress(
         view,
         ui_controls::LEFT,
         ui_controls::DOWN | ui_controls::UP,
diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller2_interactive_uitest.cc b/chrome/browser/ui/views/tabs/tab_drag_controller2_interactive_uitest.cc
index 1f5a2ea..77df1f0 100644
--- a/chrome/browser/ui/views/tabs/tab_drag_controller2_interactive_uitest.cc
+++ b/chrome/browser/ui/views/tabs/tab_drag_controller2_interactive_uitest.cc
@@ -9,7 +9,6 @@
 #include "base/command_line.h"
 #include "base/property_bag.h"
 #include "base/string_number_conversions.h"
-#include "chrome/browser/automation/ui_controls.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
@@ -25,6 +24,7 @@
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/web_contents.h"
+#include "ui/ui_controls/ui_controls.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"