Promotes more accessors from WmShell to Shell

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/common/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/test/ash_interactive_ui_test_base.h"
 #include "ash/test/test_screenshot_delegate.h"
 #include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_util.h"
 #include "base/run_loop.h"
 #include "base/test/user_action_tester.cc"
 #include "chromeos/network/network_handler.h"
 #include "ui/app_list/presenter/app_list.h"
 #include "ui/app_list/presenter/test/test_app_list_presenter.h"
@@ skipping 153 matching lines @@
   EXPECT_EQ(0, user_action_tester.GetActionCount("Accel_VolumeDown_F9"));
   SendKeyPressSync(ui::VKEY_VOLUME_DOWN, false, false, false);
   EXPECT_EQ(1, user_action_tester.GetActionCount("Accel_VolumeDown_F9"));
   // Test VOLUME_UP.
   EXPECT_EQ(0, user_action_tester.GetActionCount("Accel_VolumeUp_F10"));
   SendKeyPressSync(ui::VKEY_VOLUME_UP, false, false, false);
   EXPECT_EQ(1, user_action_tester.GetActionCount("Accel_VolumeUp_F10"));
 
   // Test TOGGLE_WIFI.
   TestNetworkObserver network_observer;
-  WmShell::Get()->system_tray_notifier()->AddNetworkObserver(&network_observer);
+  Shell::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());
 
-  WmShell::Get()->system_tray_notifier()->RemoveNetworkObserver(
+  Shell::Get()->system_tray_notifier()->RemoveNetworkObserver(
       &network_observer);
 }
 
 // Tests the app list accelerator.
 TEST_F(AcceleratorInteractiveUITest, MAYBE_ToggleAppList) {
   app_list::test::TestAppListPresenter test_app_list_presenter;
   Shell::Get()->app_list()->SetAppListPresenter(
       test_app_list_presenter.CreateInterfacePtrAndBind());
 
   EXPECT_EQ(0u, test_app_list_presenter.toggle_count());
   SendKeyPressSync(ui::VKEY_LWIN, false, false, false);
   RunAllPendingInMessageLoop();
   EXPECT_EQ(1u, test_app_list_presenter.toggle_count());
   SendKeyPressSync(ui::VKEY_LWIN, false, false, false);
   RunAllPendingInMessageLoop();
   EXPECT_EQ(2u, test_app_list_presenter.toggle_count());
 }
 
 }  // namespace test
 }  // namespace ash