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

Unified Diff: ash/autoclick/autoclick_unittest.cc

Issue 2815043002: Removes ShellPort::IsRunningInMash() (Closed)
Patch Set: dont set instance_ in constructor Created 3 years, 8 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/aura/shell_port_classic.cc ('k') | ash/display/display_configuration_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/autoclick/autoclick_unittest.cc
diff --git a/ash/autoclick/autoclick_unittest.cc b/ash/autoclick/autoclick_unittest.cc
index 6c975fb8db5c9ea58e9d6b606d0df3913d93f3d4..2bd15b102f3f2694ac13bf60a057aa57524ff63e 100644
--- a/ash/autoclick/autoclick_unittest.cc
+++ b/ash/autoclick/autoclick_unittest.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include "ash/autoclick/autoclick_controller.h"
+#include "ash/public/cpp/config.h"
#include "ash/shell.h"
#include "ash/shell_port.h"
#include "ash/test/ash_test_base.h"
@@ -71,7 +72,7 @@ class AutoclickTest : public test::AshTestBase {
// Make sure the display is initialized so we don't fail the test due to any
// input events caused from creating the display.
- if (!ShellPort::Get()->IsRunningInMash())
+ if (Shell::GetAshConfig() != Config::MASH)
Shell::Get()->display_manager()->UpdateDisplays();
RunAllPendingInMessageLoop();
}
« no previous file with comments | « ash/aura/shell_port_classic.cc ('k') | ash/display/display_configuration_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698