mash: Migrate remaining tray observers and notify functions.

ash/accelerators/accelerator_interactive_uitest_chromeos.cc

 // Copyright 2015 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/accelerators/accelerator_controller.h"
 
 #include "ash/common/shell_observer.h"
+#include "ash/common/system/chromeos/network/network_observer.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
+#include "ash/common/system/tray/system_tray_notifier.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm_shell.h"
 #include "ash/shell.h"
-#include "ash/system/chromeos/network/network_observer.h"
-#include "ash/system/tray/system_tray_notifier.h"
 #include "ash/test/ash_interactive_ui_test_base.h"
 #include "ash/test/test_screenshot_delegate.h"
 #include "ash/test/test_volume_control_delegate.h"
 #include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_util.h"
 #include "base/run_loop.h"
 #include "chromeos/network/network_handler.h"
 #include "ui/base/test/ui_controls.h"
 
 namespace ash {
@@ skipping 48 matching lines @@
     AshInteractiveUITestBase::TearDown();
   }
 
   // Sends a key press event and waits synchronously until it's completely
   // processed.
   void SendKeyPressSync(ui::KeyboardCode key,
                         bool control,
                         bool shift,
                         bool alt) {
     base::RunLoop loop;
-    ui_controls::SendKeyPressNotifyWhenDone(root_window(), key, control, shift,
-                                            alt, false, loop.QuitClosure());
+    ui_controls::SendKeyPressNotifyWhenDone(Shell::GetPrimaryRootWindow(), key,
+                                            control, shift, alt, false,
+                                            loop.QuitClosure());
     loop.Run();
   }
 
   // ash::ShellObserver:
   void OnOverviewModeStarting() override { is_in_overview_mode_ = true; }
   void OnOverviewModeEnded() override { is_in_overview_mode_ = false; }
 
-  Shell* shell() const { return Shell::GetInstance(); }
-  aura::Window* root_window() const { return Shell::GetPrimaryRootWindow(); }
-
  protected:
   bool is_in_overview_mode_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AcceleratorInteractiveUITest);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 
 #if defined(OFFICIAL_BUILD)
@@ skipping 75 matching lines @@
   EXPECT_EQ(0, volume_delegate->handle_volume_down_count());
   SendKeyPressSync(ui::VKEY_VOLUME_DOWN, false, false, false);
   EXPECT_EQ(1, volume_delegate->handle_volume_down_count());
   // VOLUME_UP.
   EXPECT_EQ(0, volume_delegate->handle_volume_up_count());
   SendKeyPressSync(ui::VKEY_VOLUME_UP, false, false, false);
   EXPECT_EQ(1, volume_delegate->handle_volume_up_count());
 
   // Test TOGGLE_WIFI.
   TestNetworkObserver network_observer;
-  shell()->system_tray_notifier()->AddNetworkObserver(&network_observer);
+  WmShell::Get()->system_tray_notifier()->AddNetworkObserver(&network_observer);
 
   EXPECT_FALSE(network_observer.wifi_enabled_status());
   SendKeyPressSync(ui::VKEY_WLAN, false, false, false);
   EXPECT_TRUE(network_observer.wifi_enabled_status());
   SendKeyPressSync(ui::VKEY_WLAN, false, false, false);
   EXPECT_FALSE(network_observer.wifi_enabled_status());
 
-  shell()->system_tray_notifier()->RemoveNetworkObserver(&network_observer);
+  WmShell::Get()->system_tray_notifier()->RemoveNetworkObserver(
+      &network_observer);
 }
 
 // Tests the app list accelerator.
 TEST_F(AcceleratorInteractiveUITest, MAYBE_ToggleAppList) {
-  EXPECT_FALSE(shell()->GetAppListTargetVisibility());
+  EXPECT_FALSE(Shell::GetInstance()->GetAppListTargetVisibility());
   SendKeyPressSync(ui::VKEY_LWIN, false, false, false);
-  EXPECT_TRUE(shell()->GetAppListTargetVisibility());
+  EXPECT_TRUE(Shell::GetInstance()->GetAppListTargetVisibility());
   SendKeyPressSync(ui::VKEY_LWIN, false, false, false);
-  EXPECT_FALSE(shell()->GetAppListTargetVisibility());
+  EXPECT_FALSE(Shell::GetInstance()->GetAppListTargetVisibility());
 }
 
 }  // namespace test
 }  // namespace ash