Removes ShellPort::IsRunningInMash()

ash/shelf/shelf_button_pressed_metric_tracker_unittest.cc

 // Copyright 2015 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/shelf/shelf_button_pressed_metric_tracker.h"
 
 #include <utility>
 
+#include "ash/public/cpp/config.h"
 #include "ash/shelf/wm_shelf.h"
-#include "ash/shell_port.h"
+#include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/shelf_button_pressed_metric_tracker_test_api.h"
 #include "ash/test/shelf_view_test_api.h"
 #include "base/macros.h"
 #include "base/test/histogram_tester.h"
 #include "base/test/simple_test_tick_clock.h"
 #include "base/test/user_action_tester.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/event.h"
 #include "ui/views/controls/button/button.h"
@@ skipping 127 matching lines @@
   metric_tracker_->ButtonPressed(kDummyEvent, sender, performed_action);
 }
 
 }  // namespace
 
 // Verifies that a Launcher_ButtonPressed_Mouse UMA user action is recorded when
 // a button is pressed by a mouse event.
 TEST_F(ShelfButtonPressedMetricTrackerTest,
        Launcher_ButtonPressed_MouseIsRecordedWhenIconActivatedByMouse) {
   // TODO: investigate failure in mash. http://crbug.com/695565.
-  if (ShellPort::Get()->IsRunningInMash())
+  if (Shell::GetAshConfig() == Config::MASH)
     return;
 
   const ui::MouseEvent mouse_event(ui::ET_MOUSE_PRESSED, gfx::Point(),
                                    gfx::Point(), base::TimeTicks(), 0, 0);
 
   base::UserActionTester user_action_tester;
   ButtonPressed(mouse_event);
   EXPECT_EQ(1,
             user_action_tester.GetActionCount("Launcher_ButtonPressed_Mouse"));
 }
 
 // Verifies that a Launcher_ButtonPressed_Touch UMA user action is recorded when
 // a button is pressed by a touch event.
 TEST_F(ShelfButtonPressedMetricTrackerTest,
        Launcher_ButtonPressed_MouseIsRecordedWhenIconActivatedByTouch) {
   // TODO: investigate failure in mash. http://crbug.com/695565.
-  if (ShellPort::Get()->IsRunningInMash())
+  if (Shell::GetAshConfig() == Config::MASH)
     return;
 
   const ui::TouchEvent touch_event(
       ui::ET_GESTURE_TAP, gfx::Point(), base::TimeTicks(),
       ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH, 0));
 
   base::UserActionTester user_action_tester;
   ButtonPressed(touch_event);
   EXPECT_EQ(1,
             user_action_tester.GetActionCount("Launcher_ButtonPressed_Touch"));
 }
 
 // Verifies that a Launcher_LaunchTask UMA user action is recorded when
 // pressing a button causes a new window to be created.
 TEST_F(ShelfButtonPressedMetricTrackerTest,
        Launcher_LaunchTaskIsRecordedWhenNewWindowIsCreated) {
   // TODO: investigate failure in mash. http://crbug.com/695565.
-  if (ShellPort::Get()->IsRunningInMash())
+  if (Shell::GetAshConfig() == Config::MASH)
     return;
 
   base::UserActionTester user_action_tester;
   ButtonPressed(SHELF_ACTION_NEW_WINDOW_CREATED);
   EXPECT_EQ(1, user_action_tester.GetActionCount("Launcher_LaunchTask"));
 }
 
 // Verifies that a Launcher_MinimizeTask UMA user action is recorded when
 // pressing a button causes an existing window to be minimized.
 TEST_F(ShelfButtonPressedMetricTrackerTest,
        Launcher_MinimizeTaskIsRecordedWhenWindowIsMinimized) {
   // TODO: investigate failure in mash. http://crbug.com/695565.
-  if (ShellPort::Get()->IsRunningInMash())
+  if (Shell::GetAshConfig() == Config::MASH)
     return;
 
   base::UserActionTester user_action_tester;
   ButtonPressed(SHELF_ACTION_WINDOW_MINIMIZED);
   EXPECT_EQ(1, user_action_tester.GetActionCount("Launcher_MinimizeTask"));
 }
 
 // Verifies that a Launcher_SwitchTask UMA user action is recorded when
 // pressing a button causes an existing window to be activated.
 TEST_F(ShelfButtonPressedMetricTrackerTest,
        Launcher_SwitchTaskIsRecordedWhenExistingWindowIsActivated) {
   // TODO: investigate failure in mash. http://crbug.com/695565.
-  if (ShellPort::Get()->IsRunningInMash())
+  if (Shell::GetAshConfig() == Config::MASH)
     return;
 
   base::UserActionTester user_action_tester;
   ButtonPressed(SHELF_ACTION_WINDOW_ACTIVATED);
   EXPECT_EQ(1, user_action_tester.GetActionCount("Launcher_SwitchTask"));
 }
 
 // Verify that a window activation action will record a data point if it was
 // subsequent to a minimize action.
 TEST_F(ShelfButtonPressedMetricTrackerTest,
@@ skipping 76 matching lines @@
 
   histogram_tester.ExpectTotalCount(
       kTimeBetweenWindowMinimizedAndActivatedActionsHistogramName, 1);
   histogram_tester.ExpectBucketCount(
       kTimeBetweenWindowMinimizedAndActivatedActionsHistogramName,
       kTimeDeltaInMilliseconds, 1);
 }
 
 }  // namespace test
 }  // namespace ash