mash: remove more shell/shelf WmWindow usage.

ash/wm/system_modal_container_layout_manager_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/wm/system_modal_container_layout_manager.h"
 
 #include <memory>
 
 #include "ash/public/cpp/config.h"
 #include "ash/public/cpp/shell_window_ids.h"
@@ skipping 783 matching lines @@
   EXPECT_FALSE(ShellPort::Get()->IsSystemModalWindowOpen());
 }
 
 TEST_F(SystemModalContainerLayoutManagerTest, VisibilityChange) {
   std::unique_ptr<aura::Window> window(OpenToplevelTestWindow(false));
   std::unique_ptr<aura::Window> modal_window(
       views::Widget::CreateWindowWithContext(new TestWindow(true),
                                              CurrentContext())
           ->GetNativeWindow());
   SystemModalContainerLayoutManager* layout_manager =
-      ShellPort::Get()
-          ->GetPrimaryRootWindowController()
-          ->GetSystemModalLayoutManager(modal_window.get());
+      Shell::GetPrimaryRootWindowController()->GetSystemModalLayoutManager(
+          modal_window.get());
 
   EXPECT_FALSE(ShellPort::Get()->IsSystemModalWindowOpen());
   EXPECT_FALSE(layout_manager->has_window_dimmer());
 
   modal_window->Show();
   EXPECT_TRUE(ShellPort::Get()->IsSystemModalWindowOpen());
   EXPECT_TRUE(layout_manager->has_window_dimmer());
 
   // Make sure that a child visibility change should not cause
   // inconsistent state.
@@ skipping 105 matching lines @@
 
 // Make sure that events are properly blocked in multi displays environment.
 TEST_F(SystemModalContainerLayoutManagerTest, BlockEventsInMultiDisplays) {
   UpdateDisplay("500x500, 500x500");
   InputTestDelegate delegate;
   delegate.RunTest(this);
 }
 
 }  // namespace test
 }  // namespace ash