mash: Port TrayUpdateTest to AshTest

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/wm_shell.h"
 #include "ash/mus/root_window_controller.h"
 #include "ash/mus/window_manager.h"
 #include "ash/mus/window_manager_application.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/test/sequenced_worker_pool_owner.h"
 #include "services/ui/public/cpp/property_type_converters.h"
 #include "services/ui/public/cpp/tests/window_tree_client_private.h"
@@ skipping 77 matching lines @@
 
   window_manager_app_->window_manager_.reset(new WindowManager(nullptr));
 
   window_tree_client_setup_.InitForWindowManager(
       window_manager_app_->window_manager_.get(),
       window_manager_app_->window_manager_.get());
   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.
+  WmShell::Get()->SetSystemTrayDelegate(
+      base::MakeUnique<test::TestSystemTrayDelegate>());
+
   ui::WindowTreeClient* window_tree_client =
       window_manager_app_->window_manager()->window_tree_client();
   window_tree_client_private_ =
       base::MakeUnique<ui::WindowTreeClientPrivate>(window_tree_client);
   int next_x = 0;
   CreateRootWindowController("800x600", &next_x);
 }
 
 std::vector<RootWindowController*> WmTestHelper::GetRootsOrderedByDisplayId() {
   std::set<RootWindowController*> roots =
@@ skipping 59 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