Fix initialization of aura::Env on some tests

BUG=883523
TEST=local run of interactive_ui_tests / try success

Change-Id: I54f81374374f83fe70441acb1634fe04e137d298
Reviewed-on: https://chromium-review.googlesource.com/1232483Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Jun Mukai <mukai@chromium.org>
Cr-Commit-Position: refs/heads/master@{#592563}

ash/test/ash_interactive_ui_test_base.cc

@@ -11,6 +11,7 @@
 #include "ui/aura/env.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/test/ui_controls_aura.h"
+#include "ui/base/ui_base_features.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/gl/test/gl_surface_test_support.h"
 
@@ -50,7 +51,9 @@ void AshInteractiveUITestBase::SetUp() {
       resources_pack_path.Append(FILE_PATH_LITERAL("resources.pak"));
   ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath(
       resources_pack_path, ui::SCALE_FACTOR_NONE);
-  env_ = aura::Env::CreateInstance();
+  env_ = aura::Env::CreateInstance(features::IsSingleProcessMash()
+                                       ? aura::Env::Mode::MUS
+                                       : aura::Env::Mode::LOCAL);
   ui_controls::InstallUIControlsAura(test::CreateAshUIControls());
 
   AshTestBase::SetUp();

chrome/test/base/view_event_test_platform_part_chromeos.cc

@@ -22,6 +22,7 @@
 #include "device/bluetooth/dbus/bluez_dbus_manager.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window_tree_host.h"
+#include "ui/base/ui_base_features.h"
 #include "ui/display/display_switches.h"
 #include "ui/wm/core/wm_state.h"
 
@@ -62,7 +63,9 @@ ViewEventTestPlatformPartChromeOS::ViewEventTestPlatformPartChromeOS(
   chromeos::CrasAudioHandler::InitializeForTesting();
   chromeos::NetworkHandler::Initialize();
 
-  env_ = aura::Env::CreateInstance();
+  env_ = aura::Env::CreateInstance(features::IsSingleProcessMash()
+                                       ? aura::Env::Mode::MUS
+                                       : aura::Env::Mode::LOCAL);
   ash::ShellInitParams init_params;
   init_params.delegate = std::make_unique<ash::TestShellDelegate>();
   init_params.context_factory = context_factory;