Move 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"
-#include "ash/common/test/wm_shell_test_api.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/mus/screen_mus.h"
 #include "ash/mus/window_manager.h"
 #include "ash/mus/window_manager_application.h"
 #include "ash/shell.h"
 #include "ash/shell_init_params.h"
 #include "ash/system/chromeos/screen_layout_observer.h"
 #include "ash/test/ash_test_environment.h"
 #include "ash/test/ash_test_views_delegate.h"
@@ skipping 347 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