Converts mash to use Shell

ash/mus/test/wm_test_helper.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/mus/test/wm_test_helper.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/test/material_design_controller_test_api.h"
 #include "ash/common/test/test_system_tray_delegate.h"
 #include "ash/common/test/wm_shell_test_api.h"
@@ skipping 83 matching lines @@
   window_manager_app_ = base::MakeUnique<WindowManagerApplication>();
 
   message_loop_.reset(new base::MessageLoopForUI());
 
   const size_t kMaxNumberThreads = 3u;  // Matches that of content.
   const char kThreadNamePrefix[] = "MashBlockingForTesting";
   blocking_pool_owner_ = base::MakeUnique<base::SequencedWorkerPoolOwner>(
       kMaxNumberThreads, kThreadNamePrefix);
 
   window_manager_app_->window_manager_.reset(new WindowManager(nullptr));
+  window_manager_app_->window_manager()->system_tray_delegate_for_test_ =
+      base::MakeUnique<test::TestSystemTrayDelegate>();
 
   window_tree_client_setup_.InitForWindowManager(
       window_manager_app_->window_manager_.get(),
       window_manager_app_->window_manager_.get());
   aura::test::EnvTestHelper().SetWindowTreeClient(
       window_tree_client_setup_.window_tree_client());
   window_manager_app_->InitWindowManager(
       window_tree_client_setup_.OwnWindowTreeClient(),
       blocking_pool_owner_->pool());
 
-  // TODO(jamescook): Pass a TestShellDelegate into WindowManager and use it to
-  // create the various test delegates.
-  WmShellTestApi().SetSystemTrayDelegate(
-      base::MakeUnique<test::TestSystemTrayDelegate>());
-
   aura::WindowTreeClient* window_tree_client =
       window_manager_app_->window_manager()->window_tree_client();
   window_tree_client_private_ =
       base::MakeUnique<aura::WindowTreeClientPrivate>(window_tree_client);
   int next_x = 0;
   CreateRootWindowController("800x600", &next_x);
 }
 
 std::vector<RootWindowController*> WmTestHelper::GetRootsOrderedByDisplayId() {
   std::set<RootWindowController*> roots =
@@ skipping 12 matching lines @@
   int next_x = 0;
   for (size_t i = 0,
               end = std::min(parts.size(), root_window_controllers.size());
        i < end; ++i) {
     UpdateDisplay(root_window_controllers[i], parts[i], &next_x);
   }
   for (size_t i = root_window_controllers.size(); i < parts.size(); ++i) {
     root_window_controllers.push_back(
         CreateRootWindowController(parts[i], &next_x));
   }
+  const bool in_shutdown = false;
   while (root_window_controllers.size() > parts.size()) {
     window_manager_app_->window_manager()->DestroyRootWindowController(
-        root_window_controllers.back());
+        root_window_controllers.back(), in_shutdown);
     root_window_controllers.pop_back();
   }
 }
 
 RootWindowController* WmTestHelper::CreateRootWindowController(
     const std::string& display_spec,
     int* next_x) {
   gfx::Rect bounds = ParseDisplayBounds(display_spec);
   bounds.set_x(*next_x);
   *next_x += bounds.size().width();
@@ skipping 23 matching lines @@
                               root_window_controller->display().id()) ==
                           screen->display_list().GetPrimaryDisplayIterator();
   screen->display_list().UpdateDisplay(
       root_window_controller->display(),
       is_primary ? display::DisplayList::Type::PRIMARY
                  : display::DisplayList::Type::NOT_PRIMARY);
 }
 
 }  // namespace mus
 }  // namespace ash