Index: ash/system/chromeos/power/tablet_power_button_controller_unittest.cc |
diff --git a/ash/system/chromeos/power/tablet_power_button_controller_unittest.cc b/ash/system/chromeos/power/tablet_power_button_controller_unittest.cc |
index 6a1917b94e0fb6646ecd1ab6874f90f37b1d6f7a..2765b0398a493076c9df587bfc7275471861d137 100644 |
--- a/ash/system/chromeos/power/tablet_power_button_controller_unittest.cc |
+++ b/ash/system/chromeos/power/tablet_power_button_controller_unittest.cc |
@@ -11,6 +11,7 @@ |
#include "ash/common/test/test_session_controller_client.h" |
#include "ash/common/wm/maximize_mode/maximize_mode_controller.h" |
#include "ash/common/wm_shell.h" |
+#include "ash/public/cpp/config.h" |
#include "ash/shell.h" |
#include "ash/test/ash_test_base.h" |
#include "ash/test/lock_state_controller_test_api.h" |
@@ -76,10 +77,10 @@ class TabletPowerButtonControllerTest : public AshTestBase { |
void TearDown() override { |
generator_ = nullptr; |
- const bool is_mash = WmShell::Get()->IsRunningInMash(); |
+ const Config config = Shell::GetAshConfig(); |
AshTestBase::TearDown(); |
- // Mash shuts down dbus after each test. |
- if (!is_mash) |
+ // Mash/mus shuts down dbus after each test. |
+ if (config == Config::CLASSIC) |
chromeos::DBusThreadManager::Shutdown(); |
} |