Removes ShellPort::IsRunningInMash()

ash/wallpaper/wallpaper_controller_unittest.cc

 // Copyright (c) 2012 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/wallpaper/wallpaper_controller.h"
 
 #include <cmath>
 #include <cstdlib>
 
 #include "ash/ash_switches.h"
+#include "ash/public/cpp/config.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
 #include "ash/session/session_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_port.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/test_session_controller_client.h"
 #include "ash/test/test_wallpaper_delegate.h"
 #include "ash/wallpaper/wallpaper_view.h"
 #include "ash/wallpaper/wallpaper_widget_controller.h"
@@ skipping 376 matching lines @@
   EXPECT_TRUE(resized_image.BackedBySameObjectAs(controller_->GetWallpaper()));
 }
 
 TEST_F(WallpaperControllerTest, GetMaxDisplaySize) {
   // Device scale factor shouldn't affect the native size.
   UpdateDisplay("1000x300*2");
   EXPECT_EQ("1000x300",
             WallpaperController::GetMaxDisplaySizeInNative().ToString());
 
   // TODO: mash doesn't support rotation yet, http://crbug.com/695556.
-  if (!ShellPort::Get()->IsRunningInMash()) {
+  if (Shell::GetAshConfig() != Config::MASH) {
     // Rotated display should return the rotated size.
     UpdateDisplay("1000x300*2/r");
     EXPECT_EQ("300x1000",
               WallpaperController::GetMaxDisplaySizeInNative().ToString());
   }
 
   // UI Scaling shouldn't affect the native size.
   UpdateDisplay("1000x300*2@1.5");
   EXPECT_EQ("1000x300",
             WallpaperController::GetMaxDisplaySizeInNative().ToString());
@@ skipping 107 matching lines @@
   EXPECT_TRUE(ShouldCalculateColors());
 
   SetSessionState(SessionState::LOCKED);
   EXPECT_FALSE(ShouldCalculateColors());
 
   SetSessionState(SessionState::LOGIN_SECONDARY);
   EXPECT_FALSE(ShouldCalculateColors());
 }
 
 }  // namespace ash