Move yet more from WmShell to Shell

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/common/test/test_session_state_delegate.h"
 #include "ash/common/test/test_system_tray_delegate.h"
@@ skipping 124 matching lines @@
 
   if (is_mash)
     CreateMashWindowManager();
   else
     CreateShell();
 
   aura::test::EnvTestHelper().SetInputStateLookup(
       std::unique_ptr<aura::InputStateLookup>());
 
   session_controller_client_.reset(
-      new TestSessionControllerClient(WmShell::Get()->session_controller()));
+      new TestSessionControllerClient(Shell::Get()->session_controller()));
   session_controller_client_->InitializeAndBind();
 
   Shell* shell = Shell::GetInstance();
   if (start_session)
     session_controller_client_->CreatePredefinedUserSessions(1);
 
   if (!is_mash) {
     // ScreenLayoutObserver is specific to classic-ash.
     // Tests that change the display configuration generally don't care about
     // the notifications and the popup UI can interfere with things like
@@ skipping 214 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