Move automation/ui_controls to ui/ui_controls

chrome/browser/ui/views/button_dropdown_test.cc

 // Copyright (c) 2011 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,
                                ui::SimpleMenuModel::Delegate {
  public:
   ButtonDropDownDragTest()
       : button_(NULL),
         ALLOW_THIS_IN_INITIALIZER_LIST(menu_model_(this)),
         menu_shown_(false),
         menu_closed_(false) {
@@ skipping 43 matching lines @@
     menu_shown_ = true;
   }
 
   virtual void MenuClosed(ui::SimpleMenuModel* /*source*/) OVERRIDE {
     menu_closed_ = true;
   }
 
   // ViewEventTestBase implementation.
   virtual void DoTestOnMessageLoop() OVERRIDE {
     // Click on the ButtonDropDown.
-    ui_controls::MoveMouseToCenterAndPress(
+    ui_test_utils::MoveMouseToCenterAndPress(
         button_,
         ui_controls::LEFT,
         ui_controls::DOWN,
         CreateEventTask(this, &ButtonDropDownDragTest::Step1));
   }
 
   void Step1() {
     // Drag to invoke the menu.
     gfx::Point view_center;
     views::View::ConvertPointToScreen(button_, &view_center);
@@ skipping 10 matching lines @@
     // Release.
     ui_controls::SendMouseEventsNotifyWhenDone(
         ui_controls::LEFT,
         ui_controls::UP,
         CreateEventTask(this, &ButtonDropDownDragTest::Step3));
   }
 
   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,
         CreateEventTask(this, &ButtonDropDownDragTest::Step4));
   }
 
   void Step4() {
     // One more hop is required because ui::SimpleMenuModel calls
     // ui::SimpleMenuModel::Delegate::MenuClosed() via a posted
     // task.
     MessageLoopForUI::current()->PostTask(
         FROM_HERE,
         CreateEventTask(this, &ButtonDropDownDragTest::Step5));
   }
 
   void Step5() {
     ASSERT_TRUE(menu_closed_);
     Done();
   }
 
  private:
   views::ButtonDropDown* button_;
   ui::SimpleMenuModel menu_model_;
   bool menu_shown_;
   bool menu_closed_;
 };
 
 VIEW_TEST(ButtonDropDownDragTest, DragActivation)