mash: remove more shell/shelf WmWindow usage.

ash/wm/workspace/workspace_layout_manager_keyboard_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/workspace/workspace_layout_manager.h"
 
 #include <string>
 #include <utility>
 
 #include "ash/public/cpp/shell_window_ids.h"
@@ skipping 46 matching lines @@
         Shell::GetPrimaryRootWindowController()->GetContainer(
             kShellWindowId_DefaultContainer);
     layout_manager_ = GetWorkspaceLayoutManager(default_container);
   }
 
   void ShowKeyboard() {
     layout_manager_->OnKeyboardBoundsChanging(keyboard_bounds_);
     restore_work_area_insets_ =
         display::Screen::GetScreen()->GetPrimaryDisplay().GetWorkAreaInsets();
     ShellPort::Get()->SetDisplayWorkAreaInsets(
-        ShellPort::Get()->GetPrimaryRootWindow(),
+        WmWindow::Get(Shell::GetPrimaryRootWindow()),
         gfx::Insets(0, 0, keyboard_bounds_.height(), 0));
   }
 
   void HideKeyboard() {
     ShellPort::Get()->SetDisplayWorkAreaInsets(
-        ShellPort::Get()->GetPrimaryRootWindow(), restore_work_area_insets_);
+        WmWindow::Get(Shell::GetPrimaryRootWindow()),
+        restore_work_area_insets_);
     layout_manager_->OnKeyboardBoundsChanging(gfx::Rect());
   }
 
   // Initializes the keyboard bounds using the bottom half of the work area.
   void InitKeyboardBounds() {
     gfx::Rect work_area(
         display::Screen::GetScreen()->GetPrimaryDisplay().work_area());
     keyboard_bounds_.SetRect(work_area.x(),
                              work_area.y() + work_area.height() / 2,
                              work_area.width(), work_area.height() / 2);
@@ skipping 30 matching lines @@
   std::unique_ptr<aura::Window> window(
       CreateToplevelTestWindow(orig_window_bounds));
 
   wm::ActivateWindow(window.get());
   EXPECT_EQ(orig_window_bounds, window->bounds());
 
   // Open keyboard in non-sticky mode.
   kb_controller->ShowKeyboard(false);
   kb_controller->ui()->GetKeyboardWindow()->SetBounds(
       keyboard::FullWidthKeyboardBoundsFromRootBounds(
-          ShellPort::Get()->GetPrimaryRootWindow()->GetBounds(), 100));
+          Shell::GetPrimaryRootWindow()->bounds(), 100));
 
   int shift =
       work_area.height() - kb_controller->GetContainerWindow()->bounds().y();
   gfx::Rect changed_window_bounds(orig_window_bounds);
   changed_window_bounds.Offset(0, -shift);
   // Window should be shifted up.
   EXPECT_EQ(changed_window_bounds, window->bounds());
 
   kb_controller->HideKeyboard(
       keyboard::KeyboardController::HIDE_REASON_AUTOMATIC);
@@ skipping 31 matching lines @@
   std::unique_ptr<aura::Window> window(
       CreateToplevelTestWindow(orig_window_bounds));
 
   wm::ActivateWindow(window.get());
   EXPECT_EQ(orig_window_bounds, window->bounds());
 
   // Open keyboard in non-sticky mode.
   kb_controller->ShowKeyboard(false);
   kb_controller->ui()->GetKeyboardWindow()->SetBounds(
       keyboard::FullWidthKeyboardBoundsFromRootBounds(
-          ShellPort::Get()->GetPrimaryRootWindow()->GetBounds(), 100));
+          Shell::GetPrimaryRootWindow()->bounds(), 100));
 
   // Window should not be shifted up.
   EXPECT_EQ(orig_window_bounds, window->bounds());
 
   kb_controller->HideKeyboard(
       keyboard::KeyboardController::HIDE_REASON_AUTOMATIC);
   EXPECT_EQ(orig_window_bounds, window->bounds());
 
   // Open keyboard in sticky mode.
   kb_controller->ShowKeyboard(true);
 
   int shift =
       work_area.height() - kb_controller->GetContainerWindow()->bounds().y();
   gfx::Rect changed_window_bounds(orig_window_bounds);
   changed_window_bounds.Offset(0, -shift);
   // Window should be shifted up.
   EXPECT_EQ(changed_window_bounds, window->bounds());
 
   kb_controller->HideKeyboard(
       keyboard::KeyboardController::HIDE_REASON_AUTOMATIC);
   EXPECT_EQ(orig_window_bounds, window->bounds());
 }
 
 }  // namespace ash