Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1556)

Unified Diff: ash/system/chromeos/power/tablet_power_button_controller_unittest.cc

Issue 2718763003: chromeos: makes more tests run in both mash and ash (Closed)
Patch Set: disable more ShelfViewTests Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/sticky_keys/sticky_keys_overlay_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 546c86121c65e842358446a28cfd5456ece5b887..8a2df301343d4768b12ed7e479d5dbeee0cf6829 100644
--- a/ash/system/chromeos/power/tablet_power_button_controller_unittest.cc
+++ b/ash/system/chromeos/power/tablet_power_button_controller_unittest.cc
@@ -75,8 +75,11 @@ class TabletPowerButtonControllerTest : public AshTestBase {
void TearDown() override {
generator_ = nullptr;
+ const bool is_mash = WmShell::Get()->IsRunningInMash();
AshTestBase::TearDown();
- chromeos::DBusThreadManager::Shutdown();
+ // Mash shuts down dbus after each test.
+ if (!is_mash)
+ chromeos::DBusThreadManager::Shutdown();
}
protected:
« no previous file with comments | « ash/sticky_keys/sticky_keys_overlay_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698