Make ui_controls only usable from interactive_ui_tests. This has two benefits:

1) don't link test code in shipping binary
2) ensure that people don't call these functions which depend on focus in sharded test targets

In a followup cl, I'll move the files to chrome\test\base
Review URL: https://codereview.chromium.org/11878013

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

18 files changed, 100 insertions, 105 deletions

diff --git a/ash/ash.gyp b/ash/ash.gyp
index 2c0eb52..5c68b03 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -283,7 +283,6 @@
         'touch/touch_observer_hud.h',
         'touch/touch_uma.cc',
         'touch/touch_uma.h',
-        'ui_controls_ash.cc',
         'volume_control_delegate.h',
         'wm/app_list_controller.cc',
         'wm/app_list_controller.h',
diff --git a/ash/shell.cc b/ash/shell.cc
index fc219da..f1c6d99 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -77,7 +77,6 @@
 #include "ui/aura/focus_manager.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/root_window.h"
-#include "ui/aura/ui_controls_aura.h"
 #include "ui/aura/window.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/compositor/layer.h"
@@ -86,7 +85,6 @@
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/size.h"
-#include "ui/ui_controls/ui_controls.h"
 #include "ui/views/corewm/compound_event_filter.h"
 #include "ui/views/corewm/corewm_switches.h"
 #include "ui/views/corewm/focus_controller.h"
@@ -209,7 +207,6 @@ Shell::Shell(ShellDelegate* delegate)
   gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_ALTERNATE, screen_);
   if (!gfx::Screen::GetScreenByType(gfx::SCREEN_TYPE_NATIVE))
     gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen_);
-  ui_controls::InstallUIControlsAura(internal::CreateUIControls());
 #if defined(OS_CHROMEOS)
   content::GpuFeatureType blacklisted_features =
       content::GpuDataManager::GetInstance()->GetBlacklistedFeatures();
diff --git a/ash/shell_factory.h b/ash/shell_factory.h
index 2c9af7e..401a54f 100644
--- a/ash/shell_factory.h
+++ b/ash/shell_factory.h
@@ -15,10 +15,6 @@ namespace gfx {
 class ImageSkia;
 }
 
-namespace ui_controls {
-class UIControlsAura;
-}
-
 namespace views {
 class View;
 class Widget;
@@ -33,8 +29,6 @@ views::Widget* CreateDesktopBackground(aura::RootWindow* root_window,
                                        int container_id);
 
 ASH_EXPORT views::Widget* CreateStatusArea(views::View* contents);
-
-ui_controls::UIControlsAura* CreateUIControls();
 }  // namespace internal
 
 }  // namespace ash
diff --git a/ash/ui_controls_ash.cc b/ash/ui_controls_ash.cc
index 3ff3b46..e455fe5 100644
--- a/ash/ui_controls_ash.cc
+++ b/ash/ui_controls_ash.cc
@@ -10,13 +10,17 @@
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/ui_controls_aura.h"
+#include "ui/aura/window_property.h"
 #include "ui/gfx/screen.h"
 #include "ui/ui_controls/ui_controls_aura.h"
 
-namespace ash {
-namespace internal {
+namespace ui_controls {
 namespace {
 
+DEFINE_OWNED_WINDOW_PROPERTY_KEY(ui_controls::UIControlsAura,
+                                 kUIControlsKey,
+                                 NULL);
+
 // Returns the UIControls object for RootWindow.
 // kUIControlsKey is owned property and UIControls object
 // will be deleted when the root window is deleted.
@@ -38,7 +42,7 @@ ui_controls::UIControlsAura* GetUIControlsForRootWindow(
 // the |point_in_screen|.
 ui_controls::UIControlsAura* GetUIControlsAt(gfx::Point* point_in_screen) {
   // TODO(mazda): Support the case passive grab is taken.
-  aura::RootWindow* root = wm::GetRootWindowAt(*point_in_screen);
+  aura::RootWindow* root = ash::wm::GetRootWindowAt(*point_in_screen);
 
   aura::client::ScreenPositionClient* screen_position_client =
       aura::client::GetScreenPositionClient(root);
@@ -77,7 +81,7 @@ class UIControlsAsh : public ui_controls::UIControlsAura {
       bool command,
       const base::Closure& closure) OVERRIDE {
     aura::RootWindow* root =
-        window ? window->GetRootWindow() : Shell::GetActiveRootWindow();
+        window ? window->GetRootWindow() : ash::Shell::GetActiveRootWindow();
     ui_controls::UIControlsAura* ui_controls = GetUIControlsForRootWindow(root);
     return ui_controls && ui_controls->SendKeyPressNotifyWhenDone(
         window, key, control, shift, alt, command, closure);
@@ -101,7 +105,7 @@ class UIControlsAsh : public ui_controls::UIControlsAura {
 
   virtual bool SendMouseEvents(ui_controls::MouseButton type,
                                int state) OVERRIDE {
-    gfx::Point p(Shell::GetScreen()->GetCursorScreenPoint());
+    gfx::Point p(ash::Shell::GetScreen()->GetCursorScreenPoint());
     ui_controls::UIControlsAura* ui_controls = GetUIControlsAt(&p);
     return ui_controls && ui_controls->SendMouseEvents(type, state);
   }
@@ -110,14 +114,14 @@ class UIControlsAsh : public ui_controls::UIControlsAura {
       ui_controls::MouseButton type,
       int state,
       const base::Closure& closure) OVERRIDE {
-    gfx::Point p(Shell::GetScreen()->GetCursorScreenPoint());
+    gfx::Point p(ash::Shell::GetScreen()->GetCursorScreenPoint());
     ui_controls::UIControlsAura* ui_controls = GetUIControlsAt(&p);
     return ui_controls && ui_controls->SendMouseEventsNotifyWhenDone(
         type, state, closure);
   }
 
   virtual bool SendMouseClick(ui_controls::MouseButton type) OVERRIDE {
-    gfx::Point p(Shell::GetScreen()->GetCursorScreenPoint());
+    gfx::Point p(ash::Shell::GetScreen()->GetCursorScreenPoint());
     ui_controls::UIControlsAura* ui_controls = GetUIControlsAt(&p);
     return ui_controls && ui_controls->SendMouseClick(type);
   }
@@ -125,7 +129,7 @@ class UIControlsAsh : public ui_controls::UIControlsAura {
   virtual void RunClosureAfterAllPendingUIEvents(
       const base::Closure& closure) OVERRIDE {
     ui_controls::UIControlsAura* ui_controls = GetUIControlsForRootWindow(
-        Shell::GetActiveRootWindow());
+        ash::Shell::GetActiveRootWindow());
     if (ui_controls)
       ui_controls->RunClosureAfterAllPendingUIEvents(closure);
   }
@@ -134,9 +138,8 @@ class UIControlsAsh : public ui_controls::UIControlsAura {
   DISALLOW_COPY_AND_ASSIGN(UIControlsAsh);
 };
 
-ui_controls::UIControlsAura* CreateUIControls() {
+ui_controls::UIControlsAura* CreateAshUIControls() {
   return new UIControlsAsh();
 }
 
-}  // namespace internal
-}  // namespace ash
+}  // namespace ui_controls
diff --git a/ash/wm/window_properties.cc b/ash/wm/window_properties.cc
index a9bc168..7c3a519 100644
--- a/ash/wm/window_properties.cc
+++ b/ash/wm/window_properties.cc
@@ -32,9 +32,6 @@ DEFINE_WINDOW_PROPERTY_KEY(RootWindowController*,
 DEFINE_WINDOW_PROPERTY_KEY(
     ash::FramePainter*, kSoloWindowFramePainterKey, NULL);
 DEFINE_WINDOW_PROPERTY_KEY(bool, kStayInSameRootWindowKey, false);
-DEFINE_OWNED_WINDOW_PROPERTY_KEY(ui_controls::UIControlsAura,
-                                 kUIControlsKey,
-                                 NULL);
 DEFINE_WINDOW_PROPERTY_KEY(bool, kUsesScreenCoordinatesKey, false);
 DEFINE_WINDOW_PROPERTY_KEY(bool, kUserChangedWindowPositionOrSizeKey, false);
 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::Rect,
diff --git a/ash/wm/window_properties.h b/ash/wm/window_properties.h
index 026c72d..38d9cf9 100644
--- a/ash/wm/window_properties.h
+++ b/ash/wm/window_properties.h
@@ -14,10 +14,6 @@ namespace gfx {
 class Rect;
 }
 
-namespace ui_controls {
-class UIControlsAura;
-}
-
 namespace ash {
 class FramePainter;
 namespace internal {
@@ -64,10 +60,6 @@ ASH_EXPORT extern const aura::WindowProperty<ash::FramePainter*>* const
 ASH_EXPORT extern const aura::WindowProperty<bool>* const
     kStayInSameRootWindowKey;
 
-// Used to store a ui_controls for each root window.
-extern const aura::WindowProperty<ui_controls::UIControlsAura*>* const
-    kUIControlsKey;
-
 // A property key to remember if a windows position or size was changed by a
 // user.
 ASH_EXPORT extern const aura::WindowProperty<bool>* const
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 2d91b5f..d34ae1a 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -168,6 +168,7 @@
       ],
       'defines': [
         'HAS_OUT_OF_PROC_TEST_RUNNER',
+        'INTERACTIVE_TESTS',
       ],
       'sources': [
         'browser/browser_keyevents_browsertest.cc',
@@ -234,6 +235,18 @@
         'test/base/view_event_test_base.cc',
         'test/base/view_event_test_base.h',
         'test/ppapi/ppapi_interactive_browsertest.cc',
+        # TODO(jam): move these files to chrome/test/base
+        '../ash/ui_controls_ash.cc',
+        '../ui/aura/ui_controls_aura.h',
+        '../ui/aura/ui_controls_win.cc',
+        '../ui/aura/ui_controls_x11.cc',
+        '../ui/ui_controls/ui_controls.h',
+        '../ui/ui_controls/ui_controls_aura.cc',
+        '../ui/ui_controls/ui_controls_gtk.cc',
+        '../ui/ui_controls/ui_controls_internal_win.cc',
+        '../ui/ui_controls/ui_controls_internal_win.h',
+        '../ui/ui_controls/ui_controls_mac.mm',
+        '../ui/ui_controls/ui_controls_win.cc',
       ],
       'conditions': [
         ['toolkit_uses_gtk == 1', {
@@ -315,6 +328,7 @@
         ['use_aura==1', {
           'sources!': [
             'browser/ui/views/tabs/tab_drag_controller_interactive_uitest_win.cc',
+            '../ui/ui_controls/ui_controls_win.cc',
           ],
         }],
         ['chromeos==1', {
diff --git a/chrome/test/base/chrome_test_launcher.cc b/chrome/test/base/chrome_test_launcher.cc
index 6f77da4..412454d 100644
--- a/chrome/test/base/chrome_test_launcher.cc
+++ b/chrome/test/base/chrome_test_launcher.cc
@@ -32,6 +32,11 @@
 #include "ui/views/focus/accelerator_handler.h"
 #endif
 
+#if defined(USE_AURA)
+#include "ui/aura/ui_controls_aura.h"
+#include "ui/ui_controls/ui_controls.h"
+#endif
+
 const char kEmptyTestName[] = "InProcessBrowserTest.Empty";
 
 class ChromeTestLauncherDelegate : public content::TestLauncherDelegate {
@@ -118,6 +123,20 @@ int main(int argc, char** argv) {
 #if defined(OS_MACOSX)
   chrome_browser_application_mac::RegisterBrowserCrApp();
 #endif
+
+// Only allow ui_controls to be used in interactive_ui_tests, since they depend
+// on focus and can't be sharded.
+#if defined(INTERACTIVE_TESTS)
+
+#if defined(OS_CHROMEOS)
+  ui_controls::InstallUIControlsAura(ui_controls::CreateAshUIControls());
+#elif defined(USE_AURA)
+  // TODO(win_ash): when running interactive_ui_tests for Win Ash, use above.
+  ui_controls::InstallUIControlsAura(aura::CreateUIControlsAura(NULL));
+#endif
+
+#endif
+
   ChromeTestLauncherDelegate launcher_delegate;
   return content::LaunchTests(&launcher_delegate, argc, argv);
 }
diff --git a/chrome/test/base/interactive_test_utils.cc b/chrome/test/base/interactive_test_utils.cc
index 8029ab6..a7406f6 100644
--- a/chrome/test/base/interactive_test_utils.cc
+++ b/chrome/test/base/interactive_test_utils.cc
@@ -101,5 +101,17 @@ bool SendMouseEventsSync(ui_controls::MouseButton type, int state) {
   return !testing::Test::HasFatalFailure();
 }
 
+namespace internal {
+
+void ClickTask(ui_controls::MouseButton button,
+               int state,
+               const base::Closure& followup) {
+  if (!followup.is_null())
+    ui_controls::SendMouseEventsNotifyWhenDone(button, state, followup);
+  else
+    ui_controls::SendMouseEvents(button, state);
+}
+
+}  // namespace internal
 
 }  // namespace ui_test_utils
diff --git a/chrome/test/base/ui_test_utils.cc b/chrome/test/base/ui_test_utils.cc
index 6205ab5..a49b1d1 100644
--- a/chrome/test/base/ui_test_utils.cc
+++ b/chrome/test/base/ui_test_utils.cc
@@ -73,7 +73,6 @@
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/size.h"
 #include "ui/snapshot/snapshot.h"
-#include "ui/ui_controls/ui_controls.h"
 
 #if defined(USE_AURA)
 #include "ash/shell.h"
@@ -674,19 +673,6 @@ void OverrideGeolocation(double latitude, double longitude) {
   runner->Run();
 }
 
-namespace internal {
-
-void ClickTask(ui_controls::MouseButton button,
-               int state,
-               const base::Closure& followup) {
-  if (!followup.is_null())
-    ui_controls::SendMouseEventsNotifyWhenDone(button, state, followup);
-  else
-    ui_controls::SendMouseEvents(button, state);
-}
-
-}  // namespace internal
-
 HistoryEnumerator::HistoryEnumerator(Profile* profile) {
   scoped_refptr<content::MessageLoopRunner> message_loop_runner =
       new content::MessageLoopRunner;
diff --git a/ui/aura/aura.gyp b/ui/aura/aura.gyp
index 9b87df4c..47ed7c6 100644
--- a/ui/aura/aura.gyp
+++ b/ui/aura/aura.gyp
@@ -93,8 +93,6 @@
         'root_window_view_mac.mm',
         'root_window.cc',
         'root_window.h',
-        'ui_controls_win.cc',
-        'ui_controls_x11.cc',
         'window.cc',
         'window.h',
         'window_delegate.h',
diff --git a/ui/aura/test/aura_test_helper.cc b/ui/aura/test/aura_test_helper.cc
index 343afef..617cd5c 100644
--- a/ui/aura/test/aura_test_helper.cc
+++ b/ui/aura/test/aura_test_helper.cc
@@ -15,11 +15,9 @@
 #include "ui/aura/test/test_activation_client.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/base/test/dummy_input_method.h"
 #include "ui/compositor/layer_animator.h"
 #include "ui/gfx/screen.h"
-#include "ui/ui_controls/ui_controls.h"
 
 namespace aura {
 namespace test {
@@ -47,7 +45,6 @@ void AuraTestHelper::SetUp() {
   test_screen_.reset(new TestScreen());
   gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, test_screen_.get());
   root_window_.reset(test_screen_->CreateRootWindowForPrimaryDisplay());
-  ui_controls::InstallUIControlsAura(CreateUIControlsAura(root_window_.get()));
 
   focus_client_.reset(new FocusManager);
   client::SetFocusClient(root_window_.get(), focus_client_.get());
diff --git a/ui/aura/ui_controls_aura.h b/ui/aura/ui_controls_aura.h
index 4007430..7e920bc 100644
--- a/ui/aura/ui_controls_aura.h
+++ b/ui/aura/ui_controls_aura.h
@@ -5,8 +5,6 @@
 #ifndef UI_AURA_UI_CONTROLS_AURA_H_
 #define UI_AURA_UI_CONTROLS_AURA_H_
 
-#include "ui/aura/aura_export.h"
-
 namespace ui_controls {
 class UIControlsAura;
 }
@@ -14,8 +12,7 @@ class UIControlsAura;
 namespace aura {
 class RootWindow;
 
-AURA_EXPORT ui_controls::UIControlsAura* CreateUIControlsAura(
-    RootWindow* root_window);
+ui_controls::UIControlsAura* CreateUIControlsAura(RootWindow* root_window);
 
 }  // namespace aura
 
diff --git a/ui/ui.gyp b/ui/ui.gyp
index 947ea2a..6c9437d 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -532,13 +532,6 @@
         'gfx/video_decode_acceleration_support_mac.mm',
         'notifications/notification_types.h',
         'notifications/notification_types.cc',
-        'ui_controls/ui_controls.h',
-        'ui_controls/ui_controls_aura.cc',
-        'ui_controls/ui_controls_gtk.cc',
-        'ui_controls/ui_controls_internal_win.cc',
-        'ui_controls/ui_controls_internal_win.h',
-        'ui_controls/ui_controls_mac.mm',
-        'ui_controls/ui_controls_win.cc',
       ],
       'target_conditions': [
         ['OS == "ios"', {
@@ -607,7 +600,6 @@
             ['exclude', 'base/x/root_window_property_watcher_x.h'],
             ['exclude', 'base/x/work_area_watcher_x.cc'],
             ['exclude', 'base/x/work_area_watcher_x.h'],
-            ['exclude', 'ui_controls_win.cc'],
            ],
         }, {  # use_aura!=1
           'sources!': [
diff --git a/ui/ui_controls/ui_controls.h b/ui/ui_controls/ui_controls.h
index 6cf908c..a52fa0f 100644
--- a/ui/ui_controls/ui_controls.h
+++ b/ui/ui_controls/ui_controls.h
@@ -9,7 +9,6 @@
 #include "build/build_config.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/gfx/native_widget_types.h"
-#include "ui/base/ui_export.h"
 
 namespace ui_controls {
 
@@ -32,25 +31,25 @@ namespace ui_controls {
 //
 // If you're writing a test chances are you want the variant in ui_test_utils.
 // See it for details.
-UI_EXPORT bool SendKeyPress(gfx::NativeWindow window,
-                            ui::KeyboardCode key,
-                            bool control,
-                            bool shift,
-                            bool alt,
-                            bool command);
-UI_EXPORT bool SendKeyPressNotifyWhenDone(gfx::NativeWindow window,
-                                          ui::KeyboardCode key,
-                                          bool control,
-                                          bool shift,
-                                          bool alt,
-                                          bool command,
-                                          const base::Closure& task);
+bool SendKeyPress(gfx::NativeWindow window,
+                  ui::KeyboardCode key,
+                  bool control,
+                  bool shift,
+                  bool alt,
+                  bool command);
+bool SendKeyPressNotifyWhenDone(gfx::NativeWindow window,
+                                ui::KeyboardCode key,
+                                bool control,
+                                bool shift,
+                                bool alt,
+                                bool command,
+                                const base::Closure& task);
 
 // Simulate a mouse move. (x,y) are absolute screen coordinates.
-UI_EXPORT bool SendMouseMove(long x, long y);
-UI_EXPORT bool SendMouseMoveNotifyWhenDone(long x,
-                                           long y,
-                                           const base::Closure& task);
+bool SendMouseMove(long x, long y);
+bool SendMouseMoveNotifyWhenDone(long x,
+                                 long y,
+                                 const base::Closure& task);
 
 enum MouseButton {
   LEFT = 0,
@@ -67,22 +66,26 @@ enum MouseButtonState {
 // Sends a mouse down and/or up message. The click will be sent to wherever
 // the cursor currently is, so be sure to move the cursor before calling this
 // (and be sure the cursor has arrived!).
-UI_EXPORT bool SendMouseEvents(MouseButton type, int state);
-UI_EXPORT bool SendMouseEventsNotifyWhenDone(MouseButton type,
-                                             int state,
-                                             const base::Closure& task);
+bool SendMouseEvents(MouseButton type, int state);
+bool SendMouseEventsNotifyWhenDone(MouseButton type,
+                                   int state,
+                                   const base::Closure& task);
 
 // Same as SendMouseEvents with UP | DOWN.
-UI_EXPORT bool SendMouseClick(MouseButton type);
+bool SendMouseClick(MouseButton type);
 
 #if defined(TOOLKIT_VIEWS)
 // Runs |closure| after processing all pending ui events.
-UI_EXPORT void RunClosureAfterAllPendingUIEvents(const base::Closure& closure);
+void RunClosureAfterAllPendingUIEvents(const base::Closure& closure);
 #endif
 
 #if defined(USE_AURA)
 class UIControlsAura;
-UI_EXPORT void InstallUIControlsAura(UIControlsAura* instance);
+void InstallUIControlsAura(UIControlsAura* instance);
+#endif
+
+#if defined(USE_ASH)
+ui_controls::UIControlsAura* CreateAshUIControls();
 #endif
 
 }  // namespace ui_controls
diff --git a/ui/ui_controls/ui_controls_aura.h b/ui/ui_controls/ui_controls_aura.h
index 90778fd..02adea5 100644
--- a/ui/ui_controls/ui_controls_aura.h
+++ b/ui/ui_controls/ui_controls_aura.h
@@ -7,14 +7,13 @@
 
 #include "base/callback_forward.h"
 #include "ui/base/keycodes/keyboard_codes.h"
-#include "ui/base/ui_export.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/ui_controls/ui_controls.h"
 
 namespace ui_controls {
 
 // An interface to provide Aura implementation of UI control.
-class UI_EXPORT UIControlsAura {
+class UIControlsAura {
  public:
   UIControlsAura();
   virtual ~UIControlsAura();
diff --git a/ui/ui_controls/ui_controls_internal_win.h b/ui/ui_controls/ui_controls_internal_win.h
index c0ff521..67d0eff 100644
--- a/ui/ui_controls/ui_controls_internal_win.h
+++ b/ui/ui_controls/ui_controls_internal_win.h
@@ -7,7 +7,6 @@
 
 #include "base/callback_forward.h"
 #include "ui/ui_controls/ui_controls.h"
-#include "ui/base/ui_export.h"
 
 namespace ui_controls {
 namespace internal {
@@ -15,17 +14,17 @@ namespace internal {
 // A utility functions for windows to send key or mouse events and
 // run the task. These functions are internal, but exported so that
 // aura implementation can use these utility functions.
-UI_EXPORT bool SendKeyPressImpl(HWND hwnd,
-                                ui::KeyboardCode key,
-                                bool control,
-                                bool shift,
-                                bool alt,
-                                const base::Closure& task);
-UI_EXPORT bool SendMouseMoveImpl(long x, long y, const base::Closure& task);
-UI_EXPORT bool SendMouseEventsImpl(MouseButton type,
-                                   int state,
-                                   const base::Closure& task);
-UI_EXPORT void RunClosureAfterAllPendingUITasksImpl(const base::Closure& task);
+bool SendKeyPressImpl(HWND hwnd,
+                      ui::KeyboardCode key,
+                      bool control,
+                      bool shift,
+                      bool alt,
+                      const base::Closure& task);
+bool SendMouseMoveImpl(long x, long y, const base::Closure& task);
+bool SendMouseEventsImpl(MouseButton type,
+                         int state,
+                         const base::Closure& task);
+void RunClosureAfterAllPendingUITasksImpl(const base::Closure& task);
 
 }  // namespace internal
 }  // namespace ui_controls
diff --git a/ui/views/widget/desktop_aura/desktop_root_window_host_win.cc b/ui/views/widget/desktop_aura/desktop_root_window_host_win.cc
index 9204a2f..ce7ee03 100644
--- a/ui/views/widget/desktop_aura/desktop_root_window_host_win.cc
+++ b/ui/views/widget/desktop_aura/desktop_root_window_host_win.cc
@@ -10,7 +10,6 @@
 #include "ui/aura/client/default_capture_client.h"
 #include "ui/aura/focus_manager.h"
 #include "ui/aura/root_window.h"
-#include "ui/aura/ui_controls_aura.h"
 #include "ui/aura/window_property.h"
 #include "ui/base/cursor/cursor_loader_win.h"
 #include "ui/base/ime/input_method_win.h"
@@ -19,7 +18,6 @@
 #include "ui/gfx/path_win.h"
 #include "ui/native_theme/native_theme_aura.h"
 #include "ui/native_theme/native_theme_win.h"
-#include "ui/ui_controls/ui_controls.h"
 #include "ui/views/corewm/compound_event_filter.h"
 #include "ui/views/corewm/input_method_event_filter.h"
 #include "ui/views/ime/input_method_bridge.h"
@@ -145,7 +143,6 @@ aura::RootWindow* DesktopRootWindowHostWin::Init(
   focus_client_->FocusWindow(content_window_);
   root_window_->SetProperty(kContentWindowForRootWindow, content_window_);
 
-  ui_controls::InstallUIControlsAura(CreateUIControlsAura(root_window_));
   return root_window_;
 }