Removes ShellPort::IsRunningInMash()

ash/screen_util_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/screen_util.h"
 
+#include "ash/public/cpp/config.h"
 #include "ash/shell.h"
-#include "ash/shell_port.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/wm_screen_util.h"
 #include "ash/wm_window.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/display/manager/display_manager.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
@@ skipping 80 matching lines @@
   ::wm::ConvertRectToScreen(primary->GetNativeView(), &r3);
   EXPECT_EQ("40,40 100x100", r3.ToString());
 
   gfx::Rect r4(40, 40, 100, 100);
   ::wm::ConvertRectToScreen(secondary->GetNativeView(), &r4);
   EXPECT_EQ("650,50 100x100", r4.ToString());
 }
 
 TEST_F(ScreenUtilTest, ShelfDisplayBoundsInUnifiedDesktop) {
   // TODO: requires unified desktop mode. http://crbug.com/581462.
-  if (ShellPort::Get()->IsRunningInMash())
+  if (Shell::GetAshConfig() == Config::MASH)
     return;
 
   display_manager()->SetUnifiedDesktopEnabled(true);
 
   views::Widget* widget = views::Widget::CreateWindowWithContextAndBounds(
       NULL, CurrentContext(), gfx::Rect(10, 10, 100, 100));
   WmWindow* window = WmWindow::Get(widget->GetNativeWindow());
 
   UpdateDisplay("500x400");
   EXPECT_EQ("0,0 500x400", wm::GetDisplayBoundsWithShelf(window).ToString());
 
   UpdateDisplay("500x400,600x400");
   EXPECT_EQ("0,0 500x400", wm::GetDisplayBoundsWithShelf(window).ToString());
 
   // Move to the 2nd physical display. Shelf's display still should be
   // the first.
   widget->SetBounds(gfx::Rect(800, 0, 100, 100));
   ASSERT_EQ("800,0 100x100", widget->GetWindowBoundsInScreen().ToString());
 
   EXPECT_EQ("0,0 500x400", wm::GetDisplayBoundsWithShelf(window).ToString());
 
   UpdateDisplay("600x500");
   EXPECT_EQ("0,0 600x500", wm::GetDisplayBoundsWithShelf(window).ToString());
 }
 
 }  // namespace test
 }  // namespace ash