mash: Migrate remaining tray observers and notify functions.

ash/common/wm_shell.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/common/wm_shell.h"
 
 #include "ash/common/focus_cycler.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
-#include "ash/common/system/tray/wm_system_tray_notifier.h"
+#include "ash/common/system/tray/system_tray_notifier.h"
 #include "ash/common/wm/overview/window_selector_controller.h"
 #include "ash/common/wm_window.h"
 #include "base/logging.h"
 
 namespace ash {
 
 // static
 WmShell* WmShell::instance_ = nullptr;
 
 // static
 void WmShell::Set(WmShell* instance) {
   instance_ = instance;
 }
 
 // static
 WmShell* WmShell::Get() {
   return instance_;
 }
 
 WmShell::WmShell()
     : focus_cycler_(new FocusCycler),
-      system_tray_notifier_(new WmSystemTrayNotifier),
+      system_tray_notifier_(new SystemTrayNotifier),
       window_selector_controller_(new WindowSelectorController()) {}
 
 WmShell::~WmShell() {}
 
 bool WmShell::IsSystemModalWindowOpen() {
   if (simulate_modal_window_open_for_testing_)
     return true;
 
   // Traverse all system modal containers, and find its direct child window
   // with "SystemModal" setting, and visible.
@@ skipping 23 matching lines @@
     system_tray_delegate_->Shutdown();
     system_tray_delegate_.reset();
   }
 }
 
 void WmShell::DeleteWindowSelectorController() {
   window_selector_controller_.reset();
 }
 
 }  // namespace ash