mash: Port TrayUpdateTest to AshTest

ash/common/test/ash_test.h

 // 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.
 
 #ifndef ASH_COMMON_TEST_ASH_TEST_H_
 #define ASH_COMMON_TEST_ASH_TEST_H_
 
 #include <memory>
 #include <string>
 
 #include "ash/common/shell_window_ids.h"
 #include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/display/manager/display_layout.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/views/widget/widget.h"
 #include "ui/wm/public/window_types.h"
 
 namespace display {
 class Display;
 }
 
 namespace views {
 class WidgetDelegate;
 }
 
 namespace ash {
 
 class AshTestImpl;
+class SystemTray;
 class WmShelf;
 class WmWindow;
 
 // Wraps a WmWindow calling WmWindow::Destroy() from the destructor. WmWindow is
 // owned by the corresponding window implementation. The only way to delete
 // WmWindow is to call WmWindow::Destroy(), which deletes the corresponding
 // window, then the WmWindow. This class calls WmWindow::Destroy() from its
 // destructor.
 class WindowOwner {
  public:
@@ skipping 16 matching lines @@
 // use the aura backend depend on "//ash/test:ash_with_aura_test_support." The
 // mus backend is not provided as a separate link target.
 class AshTest : public testing::Test {
  public:
   AshTest();
   ~AshTest() override;
 
   // Returns the WmShelf for the primary display.
   static WmShelf* GetPrimaryShelf();
 
+  // Returns the system tray on the primary display.
+  static SystemTray* GetPrimarySystemTray();
+
   bool SupportsMultipleDisplays() const;
 
   // Update the display configuration as given in |display_spec|.
   // See test::DisplayManagerTestApi::UpdateDisplay for more details.
   void UpdateDisplay(const std::string& display_spec);
 
   // Creates a visible window in the appropriate container. If
   // |bounds_in_screen| is empty the window is added to the primary root
   // window, otherwise the window is added to the display matching
   // |bounds_in_screen|. |shell_window_id| is the shell window id to give to
@@ skipping 56 matching lines @@
 
  private:
   std::unique_ptr<AshTestImpl> test_impl_;
 
   DISALLOW_COPY_AND_ASSIGN(AshTest);
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_TEST_ASH_TEST_H_