Renames WmShell to ShellPort

ash/test/ash_test.cc

 // Copyright 2016 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/test/ash_test.h"
 
 #include "ash/root_window_controller.h"
 #include "ash/shelf/wm_shelf.h"
 #include "ash/shell.h"
+#include "ash/shell_port.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/test/ash_test_impl.h"
 #include "ash/test/test_session_state_delegate.h"
 #include "ash/test/test_system_tray_delegate.h"
-#include "ash/wm_shell.h"
 #include "ash/wm_window.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/layer_type.h"
 #include "ui/display/display.h"
 
 namespace ash {
 
 WindowOwner::WindowOwner(WmWindow* window) : window_(window) {}
 
 WindowOwner::~WindowOwner() {
   window_->Destroy();
 }
 
 AshTest::AshTest() : test_impl_(AshTestImpl::Create()) {}
 
 AshTest::~AshTest() {}
 
 // static
 WmShelf* AshTest::GetPrimaryShelf() {
-  return WmShell::Get()
+  return ShellPort::Get()
       ->GetPrimaryRootWindow()
       ->GetRootWindowController()
       ->GetShelf();
 }
 
 // static
 SystemTray* AshTest::GetPrimarySystemTray() {
   return GetPrimaryShelf()->GetStatusAreaWidget()->system_tray();
 }
 
@@ skipping 37 matching lines @@
 // static
 std::unique_ptr<views::Widget> AshTest::CreateTestWidget(
     const gfx::Rect& bounds,
     views::WidgetDelegate* delegate,
     int container_id) {
   std::unique_ptr<views::Widget> widget(new views::Widget);
   views::Widget::InitParams params;
   params.delegate = delegate;
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.bounds = bounds;
-  WmShell::Get()
+  ShellPort::Get()
       ->GetPrimaryRootWindow()
       ->GetRootWindowController()
       ->ConfigureWidgetInitParamsForContainer(widget.get(), container_id,
                                               &params);
   widget->Init(params);
   widget->Show();
   return widget;
 }
 
 display::Display AshTest::GetSecondaryDisplay() {
   return test_impl_->GetSecondaryDisplay();
 }
 
 bool AshTest::SetSecondaryDisplayPlacement(
     display::DisplayPlacement::Position position,
     int offset) {
-  if (WmShell::Get()->IsRunningInMash()) {
+  if (ShellPort::Get()->IsRunningInMash()) {
     NOTIMPLEMENTED();
     return false;
   }
   return test_impl_->SetSecondaryDisplayPlacement(position, offset);
 }
 
 void AshTest::ConfigureWidgetInitParamsForDisplay(
     WmWindow* window,
     views::Widget::InitParams* init_params) {
   test_impl_->ConfigureWidgetInitParamsForDisplay(window, init_params);
 }
 
 void AshTest::ParentWindowInPrimaryRootWindow(WmWindow* window) {
-  window->SetParentUsingContext(WmShell::Get()->GetPrimaryRootWindow(),
+  window->SetParentUsingContext(ShellPort::Get()->GetPrimaryRootWindow(),
                                 gfx::Rect());
 }
 
 void AshTest::AddTransientChild(WmWindow* parent, WmWindow* window) {
   test_impl_->AddTransientChild(parent, window);
 }
 
 void AshTest::RunAllPendingInMessageLoop() {
   base::RunLoop run_loop;
   run_loop.RunUntilIdle();
 }
 
 void AshTest::SetUp() {
   test_impl_->SetUp();
 }
 
 void AshTest::TearDown() {
   test_impl_->TearDown();
 }
 
 }  // namespace ash