Add desktop vs. ash context to ui_controls

ui/aura/test/aura_test_helper.cc

Index: ui/aura/test/aura_test_helper.cc
diff --git a/ui/aura/test/aura_test_helper.cc b/ui/aura/test/aura_test_helper.cc
index d6db502db14fec076f0162b0348174fe00059113..0f9707b4212ee7041a32350922e1fce0a6fdf7b2 100644
--- a/ui/aura/test/aura_test_helper.cc
+++ b/ui/aura/test/aura_test_helper.cc
@@ -8,13 +8,13 @@
 #include "base/run_loop.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/default_capture_client.h"
+#include "ui/aura/desktop_ui_controls.h"
 #include "ui/aura/env.h"
 #include "ui/aura/focus_manager.h"
 #include "ui/aura/root_window.h"
 #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"
@@ -46,7 +46,9 @@ 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()));
+  ui_controls::UIControls::SetUIControlsInstance(
+      ui_controls::UI_CONTROLS_TYPE_NATIVE,
+      CreateDesktopUIControls(root_window_.get()));
 
   focus_manager_.reset(new FocusManager);
   root_window_->set_focus_manager(focus_manager_.get());
@@ -74,6 +76,8 @@ void AuraTestHelper::TearDown() {
   root_window_.reset();
   test_screen_.reset();
   gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, NULL);
+  ui_controls::UIControls::SetUIControlsInstance(
+      ui_controls::UI_CONTROLS_TYPE_NATIVE, NULL);
   aura::Env::DeleteInstance();
 }