Renames WmShell to ShellPort

ash/test/ash_test_helper.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/test/ash_test_helper.h"
 
 #include "ash/accelerators/accelerator_controller_delegate_aura.h"
-#include "ash/aura/wm_shell_aura.h"
-#include "ash/mus/bridge/wm_shell_mus.h"
+#include "ash/aura/shell_port_classic.h"
+#include "ash/mus/bridge/shell_port_mash.h"
 #include "ash/mus/screen_mus.h"
 #include "ash/mus/window_manager.h"
 #include "ash/mus/window_manager_application.h"
 #include "ash/public/cpp/config.h"
 #include "ash/shell.h"
 #include "ash/shell_init_params.h"
+#include "ash/shell_port.h"
 #include "ash/system/screen_layout_observer.h"
 #include "ash/test/ash_test_environment.h"
 #include "ash/test/ash_test_views_delegate.h"
 #include "ash/test/display_configuration_controller_test_api.h"
 #include "ash/test/test_screenshot_delegate.h"
 #include "ash/test/test_session_state_delegate.h"
 #include "ash/test/test_shell_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 "base/strings/string_split.h"
 #include "base/test/sequenced_worker_pool_owner.h"
 #include "chromeos/audio/cras_audio_handler.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/network/network_handler.h"
 #include "device/bluetooth/bluetooth_adapter_factory.h"
 #include "device/bluetooth/dbus/bluez_dbus_manager.h"
@@ skipping 125 matching lines @@
     // DisplayManager is specific to classic-ash.
     display::test::DisplayManagerTestApi(shell->display_manager())
         .DisableChangeDisplayUponHostResize();
     DisplayConfigurationControllerTestApi(
         shell->display_configuration_controller())
         .DisableDisplayAnimator();
 
     // TODO: disabled for mash as AcceleratorControllerDelegateAura isn't
     // created in mash http://crbug.com/632111.
     test_screenshot_delegate_ = new TestScreenshotDelegate();
-    WmShellAura::Get()
+    ShellPortClassic::Get()
         ->accelerator_controller_delegate()
         ->SetScreenshotDelegate(
             std::unique_ptr<ScreenshotDelegate>(test_screenshot_delegate_));
   } else if (config_ == Config::MUS) {
     test_screenshot_delegate_ = new TestScreenshotDelegate();
-    mus::WmShellMus::Get()
+    mus::ShellPortMash::Get()
         ->accelerator_controller_delegate_mus()
         ->SetScreenshotDelegate(
             std::unique_ptr<ScreenshotDelegate>(test_screenshot_delegate_));
   }
 }
 
 void AshTestHelper::TearDown() {
   window_manager_app_.reset();
 
   // WindowManger owns the Shell in mash.
@@ skipping 37 matching lines @@
   CHECK(config_ != Config::CLASSIC || !::wm::CaptureController::Get());
 }
 
 void AshTestHelper::RunAllPendingInMessageLoop() {
   base::RunLoop run_loop;
   run_loop.RunUntilIdle();
 }
 
 // static
 TestSessionStateDelegate* AshTestHelper::GetTestSessionStateDelegate() {
-  CHECK(WmShell::HasInstance());
+  CHECK(ShellPort::HasInstance());
   return static_cast<TestSessionStateDelegate*>(
-      WmShell::Get()->GetSessionStateDelegate());
+      ShellPort::Get()->GetSessionStateDelegate());
 }
 
 aura::Window* AshTestHelper::CurrentContext() {
   aura::Window* root_window = Shell::GetRootWindowForNewWindows();
   if (!root_window)
     root_window = Shell::GetPrimaryRootWindow();
   DCHECK(root_window);
   return root_window;
 }
 
@@ skipping 129 matching lines @@
   std::set<RootWindowController*> roots =
       window_manager_app_->window_manager()->GetRootWindowControllers();
   std::vector<RootWindowController*> ordered_roots;
   ordered_roots.insert(ordered_roots.begin(), roots.begin(), roots.end());
   std::sort(ordered_roots.begin(), ordered_roots.end(), &CompareByDisplayId);
   return ordered_roots;
 }
 
 }  // namespace test
 }  // namespace ash