mash: Migrate remaining tray observers and notify functions.

chrome/browser/chromeos/net/network_portal_notification_controller.cc

Index: chrome/browser/chromeos/net/network_portal_notification_controller.cc
diff --git a/chrome/browser/chromeos/net/network_portal_notification_controller.cc b/chrome/browser/chromeos/net/network_portal_notification_controller.cc
index f90253f40d5431d45b078427e387eef4ffbca2a2..1cc5ca8baacd6a7a247f4e20695286f6fc500631 100644
--- a/chrome/browser/chromeos/net/network_portal_notification_controller.cc
+++ b/chrome/browser/chromeos/net/network_portal_notification_controller.cc
@@ -10,8 +10,8 @@
 #include <vector>
 
 #include "ash/common/system/system_notifier.h"
-#include "ash/shell.h"
-#include "ash/system/tray/system_tray_notifier.h"
+#include "ash/common/system/tray/system_tray_notifier.h"
+#include "ash/common/wm_shell.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
@@ -301,10 +301,9 @@ void NetworkPortalNotificationController::OnPortalDetectionCompleted(
     return;
   last_network_path_ = network->path();
 
-  if (ash::Shell::HasInstance()) {
-    ash::Shell::GetInstance()
-        ->system_tray_notifier()
-        ->NotifyOnCaptivePortalDetected(network->path());
+  if (ash::WmShell::HasInstance()) {
+    ash::WmShell::Get()->system_tray_notifier()->NotifyOnCaptivePortalDetected(
+        network->path());
   }
 
   message_center::MessageCenter::Get()->AddNotification(