Revert of ash: Use system tray mojo interface to show system update tray icon

ash/common/system/update/tray_update_unittest.cc

Index: ash/common/system/update/tray_update_unittest.cc
diff --git a/ash/common/system/update/tray_update_unittest.cc b/ash/common/system/update/tray_update_unittest.cc
index 18007c8036cc8927b0e4f529ae82db5e9d6cf96c..1c6c796dbfaa3752e9b15abfa97b42957a32b0de 100644
--- a/ash/common/system/update/tray_update_unittest.cc
+++ b/ash/common/system/update/tray_update_unittest.cc
@@ -5,10 +5,10 @@
 #include "ash/common/system/update/tray_update.h"
 
 #include "ash/common/system/tray/system_tray.h"
-#include "ash/common/system/tray/system_tray_controller.h"
+#include "ash/common/system/tray/system_tray_delegate.h"
+#include "ash/common/system/tray/system_tray_notifier.h"
 #include "ash/common/test/ash_test.h"
 #include "ash/common/wm_shell.h"
-#include "ash/public/interfaces/update.mojom.h"
 
 namespace ash {
 
@@ -17,14 +17,20 @@
 // Tests that the update icon becomes visible when an update becomes
 // available.
 TEST_F(TrayUpdateTest, VisibilityAfterUpdate) {
-  TrayUpdate* tray_update = GetPrimarySystemTray()->tray_update();
+  TrayUpdate* tray_update = GetPrimarySystemTray()->GetTrayUpdateForTesting();
 
-  // The system starts with no update pending, so the icon isn't visible.
+  // The system starts with no update pending.
+  UpdateInfo initial_info;
+  WmShell::Get()->system_tray_delegate()->GetSystemUpdateInfo(&initial_info);
+  EXPECT_FALSE(initial_info.update_required);
+
+  // When no update is pending, the item isn't visible.
   EXPECT_FALSE(tray_update->tray_view()->visible());
 
   // Simulate an update.
-  WmShell::Get()->system_tray_controller()->ShowUpdateIcon(
-      mojom::UpdateSeverity::LOW, false);
+  UpdateInfo info;
+  info.update_required = true;
+  WmShell::Get()->system_tray_notifier()->NotifyUpdateRecommended(info);
 
   // Tray item is now visible.
   EXPECT_TRUE(tray_update->tray_view()->visible());