Remove Shell::shelf()|status_area_widget()|launcher()

ash/system/tray/system_tray_unittest.cc

Index: ash/system/tray/system_tray_unittest.cc
diff --git a/ash/system/tray/system_tray_unittest.cc b/ash/system/tray/system_tray_unittest.cc
index b03c548a14ff0f405661e05fafa812349dd31fc6..54f34b8ac73f9d9788e3badb2e87fb1d5323eeb0 100644
--- a/ash/system/tray/system_tray_unittest.cc
+++ b/ash/system/tray/system_tray_unittest.cc
@@ -6,6 +6,7 @@
 
 #include <vector>
 
+#include "ash/root_window_controller.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/system_tray_item.h"
 #include "ash/test/ash_test_base.h"
@@ -21,7 +22,8 @@ namespace test {
 namespace {
 
 SystemTray* GetSystemTray() {
-  return Shell::GetInstance()->status_area_widget()->system_tray();
+  return Shell::GetPrimaryRootWindowController()->status_area_widget()->
+      system_tray();
 }
 
 // Trivial item implementation that tracks its views for testing.