Cleanup ash shelf accessor functions.

ash/focus_cycler_unittest.cc

 // Copyright (c) 2012 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/focus_cycler.h"
 
 #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"
 #include "ash/shell_window_ids.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/status_area_widget_delegate.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/test/test_windows.h"
@@ skipping 67 matching lines @@
 
  protected:
   // Creates the system tray, returning true on success.
   bool CreateTray() {
     if (tray_)
       return false;
     aura::Window* parent =
         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());
     if (!tray_->GetWidget())
       return false;
     focus_cycler_->AddWidget(tray()->GetWidget());
     GetStatusAreaWidgetDelegate(tray_->GetWidget())->SetFocusCyclerForTesting(
         focus_cycler());
     return true;
   }
@@ skipping 314 matching lines @@
   // Cycle focus to the shelf.
   Shell::GetInstance()->focus_cycler()->RotateFocus(FocusCycler::FORWARD);
 
   // Cycle focus should go back to the browser.
   Shell::GetInstance()->focus_cycler()->RotateFocus(FocusCycler::FORWARD);
   EXPECT_TRUE(wm::IsActiveWindow(window.get()));
 }
 
 }  // namespace test
 }  // namespace ash