mash: Break ash system tray dependencies on ash::ShelfWidget

ash/test/ash_test_base.h

 // Copyright (c) 2012 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_TEST_ASH_TEST_BASE_H_
 #define ASH_TEST_ASH_TEST_BASE_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 45 matching lines @@
 
 class AshTestBase : public testing::Test {
  public:
   AshTestBase();
   ~AshTestBase() override;
 
   // testing::Test:
   void SetUp() override;
   void TearDown() override;
 
+  // Returns the system tray on the primary display.
+  static SystemTray* GetPrimarySystemTray();
+
   // Update the display configuration as given in |display_specs|.
   // See ash::test::DisplayManagerTestApi::UpdateDisplay for more details.
   void UpdateDisplay(const std::string& display_specs);
 
   // Returns a root Window. Usually this is the active root Window, but that
   // method can return NULL sometimes, and in those cases, we fall back on the
   // primary root Window.
   aura::Window* CurrentContext();
 
   // Versions of the functions in aura::test:: that go through our shell
@@ skipping 46 matching lines @@
   static WmShelf* GetPrimaryShelf();
 
   void set_start_session(bool start_session) { start_session_ = start_session; }
 
   AshTestHelper* ash_test_helper() { return ash_test_helper_.get(); }
 
   void RunAllPendingInMessageLoop();
 
   TestScreenshotDelegate* GetScreenshotDelegate();
 
-  // Returns the system tray on the primary display.
-  SystemTray* GetPrimarySystemTray();
-
   TestSystemTrayDelegate* GetSystemTrayDelegate();
 
   // Utility methods to emulate user logged in or not, session started or not
   // and user able to lock screen or not cases.
   void SetSessionStarted(bool session_started);
   // Sets the SessionState to active, marking the begining of transitioning to
   // a user session. The session is considered blocked until SetSessionStarted
   // is called.
   void SetSessionStarting();
   void SetUserLoggedIn(bool user_logged_in);
@@ skipping 31 matching lines @@
   ~NoSessionAshTestBase() override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NoSessionAshTestBase);
 };
 
 }  // namespace test
 }  // namespace ash
 
 #endif  // ASH_TEST_ASH_TEST_BASE_H_