Cleanup ash shelf accessor functions.

ash/focus_cycler_unittest.cc

Index: ash/focus_cycler_unittest.cc
diff --git a/ash/focus_cycler_unittest.cc b/ash/focus_cycler_unittest.cc
index 64ed1fe0ca4c3447f0a3c5770581cdc4972de302..e0b5ea1610c339c58fcb382cf34afcd84cf8f389 100644
--- a/ash/focus_cycler_unittest.cc
+++ b/ash/focus_cycler_unittest.cc
@@ -6,7 +6,6 @@
 
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf.h"
-#include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/shell_factory.h"
@@ -94,9 +93,7 @@ class FocusCyclerTest : public AshTestBase {
         Shell::GetPrimaryRootWindowController()->GetContainer(
             ash::kShellWindowId_StatusContainer);
 
-    StatusAreaWidget* widget = new StatusAreaWidget(
-        parent,
-        ShelfLayoutManager::ForShelf(parent->GetRootWindow())->shelf_widget());
+    StatusAreaWidget* widget = new StatusAreaWidget(parent, shelf_widget());
     widget->CreateTrayViews();
     widget->Show();
     tray_.reset(widget->system_tray());