Move automation/ui_controls to ui/ui_controls

ui/aura/test/aura_test_base.cc

Index: ui/aura/test/aura_test_base.cc
diff --git a/ui/aura/test/aura_test_base.cc b/ui/aura/test/aura_test_base.cc
index 16957000e20da3588178fd46dec92907ac05e9d6..dee54f65341684b0b4fffc37f7cc865e1f1f5ca6 100644
--- a/ui/aura/test/aura_test_base.cc
+++ b/ui/aura/test/aura_test_base.cc
@@ -9,6 +9,8 @@
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/test_screen.h"
 #include "ui/aura/test/test_stacking_client.h"
+#include "ui/aura/ui_controls_aura.h"
+#include "ui/ui_controls/ui_controls.h"
 
 namespace aura {
 namespace test {
@@ -25,6 +27,7 @@ void AuraTestBase::SetUp() {
   gfx::Screen::SetInstance(new aura::TestScreen(root_window_.get()));
   Env::GetInstance()->SetMonitorManager(
       CreateSingleMonitorManager(root_window_.get()));
+  ui_controls::InstallUIControlsAura(CreateUIControlsAura(root_window_.get()));
   helper_.InitRootWindow(root_window());
   helper_.SetUp();
   stacking_client_.reset(new TestStackingClient(root_window()));