Removes ShellPort::IsRunningInMash()

ash/system/ime/tray_ime_chromeos_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/system/ime/tray_ime_chromeos.h"
 
 #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"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/events/devices/device_data_manager.h"
 #include "ui/keyboard/keyboard_util.h"
 
 namespace ash {
 
 class TrayIMETest : public test::AshTestBase {
@@ skipping 133 matching lines @@
   SetIMELength(1);
   EXPECT_TRUE(default_view()->visible());
   SetIMELength(2);
   EXPECT_TRUE(default_view()->visible());
 }
 
 // Tests that if no IMEs are present the default view is hidden when a11y is
 // 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);
   SuppressKeyboard();
   EXPECT_TRUE(default_view()->visible());
   // Enable a11y keyboard.
   SetAccessibilityKeyboardEnabled(true);
   EXPECT_FALSE(default_view()->visible());
   // Disable the a11y keyboard.
   SetAccessibilityKeyboardEnabled(false);
   EXPECT_TRUE(default_view()->visible());
 }
 
 // Tests that clicking on the keyboard toggle causes the virtual keyboard
 // 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);
   SuppressKeyboard();
   EXPECT_FALSE(keyboard::IsKeyboardEnabled());
   views::View* toggle = GetToggleView();
   ui::GestureEvent tap(0, 0, 0, base::TimeTicks(),
                        ui::GestureEventDetails(ui::ET_GESTURE_TAP));
   // Enable the keyboard.
   toggle->OnGestureEvent(&tap);
   EXPECT_TRUE(keyboard::IsKeyboardEnabled());
   EXPECT_TRUE(default_view()->visible());
 
   // Clicking again should disable the keyboard.
   toggle = GetToggleView();
   tap = ui::GestureEvent(0, 0, 0, base::TimeTicks(),
                          ui::GestureEventDetails(ui::ET_GESTURE_TAP));
   toggle->OnGestureEvent(&tap);
   EXPECT_FALSE(keyboard::IsKeyboardEnabled());
   EXPECT_TRUE(default_view()->visible());
 }
 
 }  // namespace ash