Nix GetRootWindowController, use RootWindowController::ForWindow.

ash/accelerators/accelerator_controller.cc

Index: ash/accelerators/accelerator_controller.cc
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
index 21e54ed274f9af75b29d9ef2a7aee9e9d5028e02..cff2bbf0d451c44d5bda21b1c828b58e641bfd1a 100644
--- a/ash/accelerators/accelerator_controller.cc
+++ b/ash/accelerators/accelerator_controller.cc
@@ -354,7 +354,8 @@ void HandleShowMessageCenterBubble() {
 void HandleShowSystemTrayBubble() {
   base::RecordAction(UserMetricsAction("Accel_Show_System_Tray_Bubble"));
   aura::Window* target_root = Shell::GetRootWindowForNewWindows();
-  SystemTray* tray = GetRootWindowController(target_root)->GetSystemTray();
+  SystemTray* tray =
+      RootWindowController::ForWindow(target_root)->GetSystemTray();
   if (!tray->HasSystemBubble()) {
     tray->ShowDefaultView(BUBBLE_CREATE_NEW);
     tray->ActivateBubble();
@@ -526,8 +527,7 @@ void HandleLock() {
 
 void HandleShowStylusTools() {
   base::RecordAction(UserMetricsAction("Accel_Show_Stylus_Tools"));
-  GetRootWindowController(Shell::GetRootWindowForNewWindows())
-      ->shelf()
+  Shelf::ForWindow(Shell::GetRootWindowForNewWindows())
       ->GetStatusAreaWidget()
       ->palette_tray()
       ->ShowPalette();