mash: remove more shell/shelf WmWindow usage.

ash/shelf/shelf_window_watcher_unittest.cc

 // Copyright 2013 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_window_watcher.h"
 
 #include "ash/public/cpp/config.h"
 #include "ash/public/cpp/shelf_item.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/public/cpp/window_properties.h"
@@ skipping 264 matching lines @@
       CreateTestWidget(nullptr, kShellWindowId_DefaultContainer, gfx::Rect());
   aura::Window* window2 = widget2->GetNativeWindow();
   window2->SetProperty(kShelfIDKey, new std::string(ShelfID("b").Serialize()));
   window2->SetProperty(kShelfItemTypeKey, static_cast<int32_t>(TYPE_DIALOG));
   EXPECT_EQ(3, model_->item_count());
 
   // Create a panel-type widget to mimic Chrome's app panel windows.
   views::Widget panel_widget;
   views::Widget::InitParams panel_params(views::Widget::InitParams::TYPE_PANEL);
   panel_params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
-  ShellPort::Get()
-      ->GetPrimaryRootWindow()
-      ->GetRootWindowController()
+  Shell::GetPrimaryRootWindowController()
       ->ConfigureWidgetInitParamsForContainer(
           &panel_widget, kShellWindowId_PanelContainer, &panel_params);
   panel_widget.Init(panel_params);
   panel_widget.Show();
   aura::Window* panel_window = panel_widget.GetNativeWindow();
   panel_window->SetProperty(kShelfIDKey,
                             new std::string(ShelfID("c").Serialize()));
   panel_window->SetProperty(kShelfItemTypeKey,
                             static_cast<int32_t>(TYPE_APP_PANEL));
   EXPECT_EQ(4, model_->item_count());
@@ skipping 50 matching lines @@
       CreateTestWidget(nullptr, kShellWindowId_DefaultContainer, gfx::Rect());
   ShelfWindowWatcherTest::CreateShelfItem(widget->GetNativeWindow());
   EXPECT_EQ(1, model->item_count());
 
   // Start the test user session; ShelfWindowWatcher will find the open window.
   SetSessionStarted(true);
   EXPECT_EQ(2, model->item_count());
 }
 
 }  // namespace ash