Move yet more from WmShell to Shell

chrome/test/base/view_event_test_platform_part_chromeos.cc

 // Copyright 2014 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 "chrome/test/base/view_event_test_platform_part.h"
 
 #include <memory>
 
 #include "ash/common/test/test_session_controller_client.h"
 #include "ash/common/wm_shell.h"
@@ skipping 54 matching lines @@
       new ash::test::TestShellDelegate();
   ash::ShellInitParams init_params;
   init_params.delegate = shell_delegate;
   init_params.context_factory = context_factory;
   init_params.context_factory_private = context_factory_private;
   init_params.blocking_pool = content::BrowserThread::GetBlockingPool();
   base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
       switches::kHostWindowBounds, "0+0-1280x800");
   ash::Shell::CreateInstance(init_params);
   ash::test::TestSessionControllerClient session_controller_client(
-      ash::WmShell::Get()->session_controller());
+      ash::Shell::Get()->session_controller());
   session_controller_client.CreatePredefinedUserSessions(1);
   GetContext()->GetHost()->Show();
 }
 
 ViewEventTestPlatformPartChromeOS::~ViewEventTestPlatformPartChromeOS() {
   ash::Shell::DeleteInstance();
   env_.reset();
 
   chromeos::NetworkHandler::Shutdown();
   chromeos::CrasAudioHandler::Shutdown();
   bluez::BluezDBusManager::Shutdown();
   chromeos::DBusThreadManager::Shutdown();
   // Ash Shell can't just live on its own without a browser process, we need to
   // also shut down the message center.
   message_center::MessageCenter::Shutdown();
 }
 
 }  // namespace
 
 // static
 ViewEventTestPlatformPart* ViewEventTestPlatformPart::Create(
     ui::ContextFactory* context_factory,
     ui::ContextFactoryPrivate* context_factory_private) {
   return new ViewEventTestPlatformPartChromeOS(context_factory,
                                                context_factory_private);
 }