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

Unified Diff: ash/system/ime/tray_ime_chromeos_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
Index: ash/system/ime/tray_ime_chromeos_unittest.cc
diff --git a/ash/system/ime/tray_ime_chromeos_unittest.cc b/ash/system/ime/tray_ime_chromeos_unittest.cc
index 9f4431e4c6e0c3db023b936cb3b84c3ab48b191a..a7b2fe471e21f5f5567621acb713216b0cac6ed1 100644
--- a/ash/system/ime/tray_ime_chromeos_unittest.cc
+++ b/ash/system/ime/tray_ime_chromeos_unittest.cc
@@ -6,8 +6,8 @@
#include "ash/accessibility_delegate.h"
#include "ash/accessibility_types.h"
+#include "ash/public/cpp/config.h"
#include "ash/shell.h"
-#include "ash/shell_port.h"
#include "ash/system/ime_menu/ime_list_view.h"
#include "ash/system/tray/system_tray_notifier.h"
#include "ash/test/ash_test_base.h"
@@ -161,7 +161,7 @@ TEST_F(TrayIMETest, ShownWithSingleIMEWhenManaged) {
// enabled.
TEST_F(TrayIMETest, HidesOnA11yEnabled) {
// TODO: investigate failure in mash. http://crbug.com/695561.
- if (ShellPort::Get()->IsRunningInMash())
+ if (Shell::GetAshConfig() == Config::MASH)
return;
SetIMELength(0);
@@ -179,7 +179,7 @@ TEST_F(TrayIMETest, HidesOnA11yEnabled) {
// to toggle between enabled and disabled.
TEST_F(TrayIMETest, PerformActionOnDetailedView) {
// TODO: investigate failure in mash. http://crbug.com/695561.
- if (ShellPort::Get()->IsRunningInMash())
+ if (Shell::GetAshConfig() == Config::MASH)
return;
SetIMELength(0);
« no previous file with comments | « ash/sticky_keys/sticky_keys_overlay_unittest.cc ('k') | ash/system/overview/overview_button_tray_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698